Stuff: bunch of modifications everywhere