Various fixes; some hyperspace progress