adds more specs, seems complete