pending minor fixes from 4 month ago...