Rev 13

Some improvements