yet more maintenance
some fixes