v09

more housekeeping