Added todos, fixed some things