adjust and clean up for release