Started to make the decorator more stable, and fixed the 'Already decorating' error.