table parsing improved