Bugs fixes, and enhancements;