Attempt to improve boat plugin, still too many expolits