major updates, merging of Tomoyo's and Fuko's paths