Hivesigner improvements #1