Fix some blatant whackery. Still there exists some obvious overlaps.