stuff u know right
Merge branch 'master' into sean
small fixes
Merge branch 'sean'