many many changes, adding some humor