Improved code & bug fixes
Bug fixes
Improved code