Fixed (hopefully) some random crahes; Extensive work on block physics
Merge remote-tracking branch 'upstream/master'