Total fix & cleanup.