multiple fixes and design enhancement
removed the hard coded password