After getting these issues done, feature freeze and extensive testing!