Updates and improvements for official repo bump.