I am become Roomba, cleaner of miscellaneous things

Miscellaneous small fixes/adjustments.