up-to-date with WPEC

updated files to be accurate with WPEC's latest code.