modified save
Merge from Lukobranch and minor changes