#14: improved processing of missing files
#11 bugfixes