Fixed most shit