Some quick changes

Pity I couldn't do more