fixed a ton of specs
fixing a hilacious merge conflict