Various fixes

If you would like them broken down or described, let me know.  Most of these changes could be integrated into other materials.