Cleanup, update and add specs.