New Fixed Data, minor other updates