Fixed quite alot and fixed HubSelector