Add a few comments
Separate differential annotations into own property
Fix object cloning and output namespace issue