fixes before submission