corrected some things for #1