commit-fixed major issues