fixed the weird scoring problems and cleaned up some stuff in the code