Fixed A Few things