Made changes so that project would build. Anybody want to review them to make sure they're good?