few fixes and changes