various fixes, additional files, ...