cleanup
add SaveDirectory configuration option