corrections and tweaks