Decorator, also fixes for broken stuff and memory leaks too.