Improved the demo a bit
Added lots of comments