refined looks and some bug fixes and enhancements