Made some changes and tweaks to get the project compiling on my machine.