Added/removed a few things, cleaned stuff up.
Fixed todo.