Removed some input parameters, changed code so parameters are input in meters and converted internally
Resolved conflicts