* Some enhancements and BUGFIXES