Tweaks, still WIP
Tweaks, still WIP