compilation issues
Merge with released fixes
New debugging options