got rid of some more try code, got code to compile, fixed specs
add missing code