small changes, housekeeping