Tons more tweaks

Still really getting it setup