bug fixes from joe fixed, plus minor ui changes