Hopefully fished out the dieing connection issue and fixed map command