properties generation fixed
Issue-1 and few other bugs fixed