retab and minor fixes