Little Fixes
Little fixes and api changes

...include extensions...