More tweaks, added block class module