init: edit and two minor fixes