some fixes before submission