More marks fixes pt 2