small bug fixes
merge attempt