cleaned up, added some notes