some more fixes, specs pass now