Tidy up comments
Deep clone
Update TODOs