Things worked out at my desk

Some changes.