latest changes; minor fixes