some additional small bug fixes
Fixed another set of small bugs