more specs and bugfixes