various changes - peek with sv support polished.