Added RS Nikhil's latest bugfixes