Small changes and tweaks

spelling, some minor performance improvements, and some usability
improvements.