several fixes across works and archive