fixes from work computer