massupdate, bring inline with CM in some stuff + my own changes