specs, fixes

- add specs for units
- hax for cisterny oddities for now