adding a few fixes