small corrections and fixes