changes for dev
bug fixes and enhancements