some pedantic changes