bug fixes, icon improvement, and other enhancements