Added save, fixed issues