Moves maritime and disputed checks to separate functions. Improves checks.