Updates post code drop 24, remaining errors seem legit