added savButtons and readButtons (and cleaned a little, as usual)