small fixes
updated server stuff, added client stuff