Bugs fixed, enhancements