fix whence, and fix Nanomark application.