various fixes and seems to be working for first time!