i think fixed most things