scaling and boundries
Merge branch 'master' into jamiltron

* master:
  scaling and boundries
Adding in NPC ducks