Fixing a bunch of stuff up. Install is cleaner now.