minor bug fixes and small UI improvements

also begun work on tests