many minor cleanup issues for attempted release later...