Fix for "late" flag
Bugfixes and cleanup
Add/update subset collections too
Better comment