Implement the needs of @AnonSphere and the stuff he did not request yet

...and fix #1115