just a couple bug fixes
conflicts resolved