include project specific changes and fix some things