Some tweaks to ships and scaling var