Fixed block attribute leaks, added some tags