Hotfix 03 01 2013

Addresses a couple of smaller todos mentioned in commit messages