bug fixes and user interface improvement