few fixes and additions