add combine stuff to python and clean up