adjust dma alignment and some cleanup