More fixes. SOF is in, but saving isn't working proper! Confused...