Latest fixes and adition changes