Few text updates and some other fixes.