Add server code + fix various bugs