just a few fixes