update for comeonin and minor improvements