cleaned up, removed todos, inserted cool bonus stuff