Further improvements on form_boat