more specs and fixes