more specs and more fixes