fix paths
add a few options