updates all over the place
Merge pull request #67 from NeirinD/patch-5

updates all over the place