General cleanup, updated project files.