Change include path so editors can find
Minor reflow of syntax to return values from case statements
Merge branch 'fixes' into devel