reorganized and cleaned up fixes for deprecated attributes, added dt and dd to the blocks