Added 3 extra blocks and fixed some small issues