Reformatting, tweaks to autochain and autorun