Minor tweaks
Evertything brokes