made few fixes