full fix

corrected all - the old version of painful to watch