cleaned extension
cleaned up server code a little