clean up & QA & fork