Fixed Commit Issues

Up to date with main project repository.