Fixes, minor style tweaks, simpledom upgrade