Some fixes
improvements