Increase error margin
Tidy up Vessel implementation