Improvements bug fixes before submission