Removed milkyway hardcoding, improved comms