latest changes, some clean up.