Final thingys+ cleaning some* mess

*: almost 2 things