* Fixed many issues regarding blocks