some  fixes and suggestions