made all specs pass and whatnot