Made scoreMark less buggy and some other stuff