13th commit

Various changes