Finished some things, added others