Cleaned up a ton of stuff, many improvements