cleaning up and adding notes