cleanup base
cleanup serverbase
typo
Merge branch 'clenaup'