Misc cleanup, extra specs and minor bugfixes