Lekro's uncommited Docs into commted one + fixes