some final changes before big push