Small tweaks addressing the TODO list

A bunch of small tweaks that resolve some of the items on the list in issue #26