Tons of fixes and project sync additions