Bug fixes and few advancements..