small changes to merge parts of my branch into this branch