Cleaning up and adding key stuff