Various Fixes

- Fixed various problems
- Initial commit of the next example.