Changes made monday

Changes that I downloaded but couldn’t get to work yet
Revert a8bf176..29d0e0d

This rolls back to commit a8bf17631ccfbaf3b53cddd912fb5126d413485d.