fixes made, now only save/load left