New fixes and additions to project.