bit of cleanup and updated specs

and by "updated specs", i mean "commented out the ones that didn't work
anymore"