made a couple of changes.
Fixing some stuff up because of that huge fucking merge.