many fixex, final version 2
+ motivation