Tweaked commands and fixed file saving