Renumbering FUNs, part 1
Renumbering FUNs, part 2 (shuffle the code)
Added FUN CONST (40)
merging