small bug fixes and aesthetic changes