Made some things prettier, added a todo