Updating pathnames structures. Also cleanup formatting for hashtables and numbers structures.