adds, fix and cleanup spec