some  fixes