pushing bugfixes for issues encountered in QA