more bug fixes
fixed merge conflicts