Fix options loading
While here add a couple of debug messages
Merge branch 'master' into testing