minor modifications before merging back into master