made a few fixes