clean up and final touches