Sp8.sc1.fix map dimensions and refactor