clean up debug info
fix offset