small tweaks and comments
added TODOs
more fixes, updated examples