lots of feature enhancements and bug fxies to UI