Mod: more specs, cleanup