Cleaned more garbage, fixed more garbage.