re-added path_info handler + small fixes