filling out more stuff
minor other edits