Lots more specs and fixed some bugs from them