added fixed blocks
merged conflicts
master merged into highscore