Consolidation of recent suggestions, fixes and improvements.