Two patches

Fixed paper and save slots. Still more to do but wanted to get these in.