Various corrections and tweaks