- make sample project a little more simple
- add some #FIXMEs to the code