few minor improvements and bug fixes
sorted out the merge conflicts