Miscellaneous fixes and enhancements

+1 that sounds fine.