Resolved a few of the ToDos in the source