small fixes, rematch
Merge branch 'master' into sean