General Clean up part 2
Revert a derp + misc
Re-write #1