Initial commit
code cleanup
Merge branch 'serverfix'