Some fixes + part9 OK v1...