Update for 4.5
Code cleanup
Merge pull request #461 from colemanw/updates

A few updates & tweaks