Add thread safety to dispatcher.
Fix parse bug where extra colons caused error.