Minor fixes

See commit messages
give the handlers time to run...

i'll update it to use some other signalling. this was just a lazy hack