Simplyfied am0 further and added (hopefully) final am1 header