Added some more block definitions and fixed a small bug