Cad said some good things.
One thing that would help you tremendously, I think, is start referring specifically to "punishment" or "trouble. Anytime he is doing undesirable things say "If you don't stop now you are going to get punished" or "You have until the count of three and then you will...