more specs and some more fixes