Minor changes
Nice progress