did some fixes, added rudimentary UI