Some monster updates
Merge pull request #1345 from EPuncker/master

Some monster updates