improve sqlwall & parser