Brought project file up to date and fixed a few errors that this caused