small changes
cleaned things up for putting in AN