small refactoring
fighting race conditions
changing everything again. sigh.
hacking and slashing..