Fixed save, other features