corrections and fixes