new manual format cmd; misc fixes