Fixed A few things