several fixes, spelling improvements