cleaned up server code
updated notes