fixes from work