Added Duplicator Exception

Also changed some little things in the code