Fixed deprecation warnings for specs
Added / cleaned up comments