init: add miscellaneous updates from CM's branch