Fixed the overlay crash and few other modificatio