made several trivial changes
fixed merge issue