Final cleanup and fixes vis a vis usability testing. Nothing like a commit 2 hours before the deadline.