lots of small miscellaneous cleanup things; more substantial update coming soon
lots of minor cleanup things; more substantial update coming soon