Adjustments
Made a few fixes