Mostly tweaking

- A few minor fixes as well