Fix bs-data bug + adding info/check for bs-info