Adds "other notes" field, cleaned up some code