some minor changed to prototype
Merge branch 'master' of https://github.com/PCannings/DWP