Yannis: merge and fixed / cleanedup minor things