Switched to use British spelling consitently
Added more speed conversions