Resolve first major issue (#1) and cleaned out cruft.

Made things better, faster!