minor fixes
merge commits from repo