bugfixes and general UI touchups