Normalize tildes in filenames to be user's home directory. Remove some outdated comments and add some string interpolation in the mean time
Merge conflicts