Tweak save deck functionality and cleanup code.