fix paths, issues in "client mode" other minor issues