Couple of tweaks+bug fixes