added new features, enhancements and bugs