very late initial commit
several changes
sm