fixing a nullpointer crash, getting rid of back arrows where we don't
need them