Some changes that probably aren't. CRYPTIC
Hope this doesn't break anything.
Moved some stuff to config