Re-work client
Fix map
Change password
more
Fix underscore
More work