Fixed A Lot Of Issues