changed hardcoded stuff left over from testing
Merge branch 'master' into CAPER