updated docs

ready to merge :) for real this time
Merge branch 'dev'