various small corrections and tweaks