boston form plus other fixes