server fixes
Merge branch 'master' of https://github.com/patel66/Dreamer
Merge branch 'master' of https://github.com/patel66/Dreamer
Pullin an pushin