Global minor corrections and cleanup