nix
fixed
merged develop into new server stuff