fixed multiple piping issues