added malfunc, more cleanin', fixin'