Ensured that all variables are quoted correctly
Removed the -r options from dotilfes
Fixed formatting issues