Some cleanup and error handling
Update specs