tried to fix all the commit problems