Added some small fixes and examples