some clean up, directory fixes