plug more specs and fixes