added cool fade and cleaned cruft