project changes and other fixes