High scoring in, some bug fixes