Update include files and fix a couple of minor bugs
3 files changed