Bugfixes; remove dead code; more specs