cleanup and fix specs