fixing some problems when commiting