tidy up and osx fix to score parser