fixed a few bugs and changes scores a bit
[0.31 playable version]