Reenabled subroom duplication
Cleanup and Todo