small bug fixes
fixed merge conflicts