Reducing scope of more variables
Fixed error in save.c