finally, all master tests passing. fixing signal/type issue