diss: finishing boatshape stuff