Misc small changes, better specs