Just a few minor tweaks, added a todolist as well