fixes #109 + new UI enhancements