more twiks and clean up