Added some comments and the Witch.