some few corrections and tweaks