Fixes and added server