renaming
confused
cleanup again
pe_functions back
tweaks