Bugs fixed & enhancements