grim/guifications2

some random cleanups

2011-12-04, Gary Kramlich
a528ba665d86
some random cleanups
2.17dev