Cleaner, faster, better

A couple weeks worth of changes