bug fixes
fixed merge conflicts
all new features merged