from valtop -- important fixes

NO MERGES TO HERE