removed some debug lines, added block naming