Fixed some loading bugs, added todo list