Major cleanups and tweaking; reduction of bloat.