a few minor fixes and tweaks
a few minor fixes and tweaks
Merge pull request #1 from andypiper/aptweaks

Some cleanup and tweaks