+ Bug Fixes & Minor enhancements