Update/change some PODs; remove the empty lines in small subs.