note-to-self: commit files prior to going to lunch, can't remember the changes. Preaty sure they are only some minor changes and added comments