added a bunch
Merge branch 'develop'