Improved support, removed termination bug, added UI