some small changes from work