paths and some clean up