Minor tweaks, added todo list