diff --git a/MAC/APL/StationCU/src/StationControl/ActiveObs.cc b/MAC/APL/StationCU/src/StationControl/ActiveObs.cc
index 7e910768c4946a27a3a80fb115fa50e5e49665dd..030356be9837723363760fab61d57c10a1c8cfec 100644
--- a/MAC/APL/StationCU/src/StationControl/ActiveObs.cc
+++ b/MAC/APL/StationCU/src/StationControl/ActiveObs.cc
@@ -153,7 +153,7 @@ GCFEvent::TResult ActiveObs::initial(GCFEvent& event,
 		break;
 	
 	default:
-		LOG_DEBUG_STR ("initial, default");
+		LOG_DEBUG_STR(itsName << ":inital default: " << eventName(event));
 		status = GCFEvent::NOT_HANDLED;
 		break;
 	}    
@@ -167,7 +167,6 @@ GCFEvent::TResult ActiveObs::initial(GCFEvent& event,
 //
 GCFEvent::TResult	ActiveObs::starting(GCFEvent&	event, GCFPortInterface&	port)
 {
-//	LOG_DEBUG(formatString("%s:starting - %04X", itsName.c_str(), event.signal));
 	LOG_DEBUG(formatString("%s:starting - %s", itsName.c_str(), eventName(event).c_str()));
 
 	switch (event.signal) {
@@ -269,7 +268,7 @@ GCFEvent::TResult	ActiveObs::starting(GCFEvent&	event, GCFPortInterface&	port)
 		break;
 
 	default:
-		LOG_DEBUG_STR(itsName << ":default(" << eventName(event) << ")");
+		LOG_DEBUG_STR(itsName << ":starting default: " << eventName(event) << "@" << port.getName());
 		return(GCFEvent::NOT_HANDLED);
 		break;
 	}
@@ -283,7 +282,7 @@ GCFEvent::TResult	ActiveObs::starting(GCFEvent&	event, GCFPortInterface&	port)
 //
 GCFEvent::TResult	ActiveObs::connected(GCFEvent&	event, GCFPortInterface&	port)
 {
-	LOG_DEBUG_STR(itsName << ":connected");
+	LOG_DEBUG_STR(itsName << ":connected - " << eventName(event) << "@" << port.getName());
 
 	switch (event.signal) {
 	case F_ENTRY: 
@@ -369,7 +368,7 @@ GCFEvent::TResult	ActiveObs::connected(GCFEvent&	event, GCFPortInterface&	port)
 		break;
 
 	default:
-		LOG_DEBUG_STR(itsName << ":default(" << eventName(event) << ")");
+		LOG_DEBUG_STR(itsName << ":connected default: " << eventName(event) << "@" << port.getName());
 		return(GCFEvent::NOT_HANDLED);
 		break;
 	}
@@ -383,7 +382,7 @@ GCFEvent::TResult	ActiveObs::connected(GCFEvent&	event, GCFPortInterface&	port)
 //
 GCFEvent::TResult	ActiveObs::standby(GCFEvent&	event, GCFPortInterface&	port)
 {
-	LOG_DEBUG_STR(itsName << ":standby");
+	LOG_DEBUG_STR(itsName << ":standby - " << eventName(event) << "@" << port.getName());
 
 	switch (event.signal) {
 	case F_ENTRY: 
@@ -432,10 +431,11 @@ GCFEvent::TResult	ActiveObs::standby(GCFEvent&	event, GCFPortInterface&	port)
 				LOG_ERROR_STR("Start of TBB failed with error, " << msg.result << 
 								". CONTINUING OBSERVATION WITHOUT TBB.");	
 				itsUsesTBB = false;
-				break;
 			}
-			LOG_INFO_STR("TBBController has started the beam");
-			itsTBBCntlrReady = true;
+			else {
+				LOG_INFO_STR("TBBController has started the beam");
+				itsTBBCntlrReady = true;
+			}
 		}
 		else {
 			ASSERTSTR(false, "Received claimed event of unknown controller: " << msg.cntlrName);
@@ -472,7 +472,7 @@ GCFEvent::TResult	ActiveObs::standby(GCFEvent&	event, GCFPortInterface&	port)
 		break;
 
 	default:
-		LOG_DEBUG_STR(itsName << ":default(" << eventName(event) << ")");
+		LOG_DEBUG_STR(itsName << ":standby default: " << eventName(event) << "@" << port.getName());
 		return(GCFEvent::NOT_HANDLED);
 		break;
 	}
@@ -486,8 +486,7 @@ GCFEvent::TResult	ActiveObs::standby(GCFEvent&	event, GCFPortInterface&	port)
 //
 GCFEvent::TResult	ActiveObs::operational(GCFEvent&	event, GCFPortInterface&	port)
 {
-//	LOG_DEBUG_STR(itsName << ":operational");
-	LOG_DEBUG(formatString("%s:operational - %s", itsName.c_str(), eventName(event).c_str()));
+	LOG_DEBUG_STR(itsName << ":operational - " << eventName(event) << "@" << port.getName());
 
 	switch (event.signal) {
 	case F_ENTRY: 
@@ -598,7 +597,7 @@ GCFEvent::TResult	ActiveObs::operational(GCFEvent&	event, GCFPortInterface&	port
 	break;
 
 	default:
-		LOG_DEBUG_STR(itsName << ":default(" << eventName(event) << ")");
+		LOG_DEBUG_STR(itsName << ":operational default: " << eventName(event) << "@" << port.getName());
 		return(GCFEvent::NOT_HANDLED);
 		break;
 	}
@@ -674,7 +673,7 @@ GCFEvent::TResult	ActiveObs::stopping(GCFEvent&	event, GCFPortInterface&	/*port*
 	break;
 
 	default:
-		LOG_DEBUG_STR(itsName << ":default(" << eventName(event) << ")");
+		LOG_DEBUG_STR(itsName << ":stopping default: " << eventName(event));
 		return(GCFEvent::NOT_HANDLED);
 		break;
 	}
diff --git a/MAC/APL/StationCU/src/StationControl/StationControl.cc b/MAC/APL/StationCU/src/StationControl/StationControl.cc
index 9f8f907cf9bac11770cfe0a9bddd6111a7d3d3d2..d1e82693d38aa9c5ff3f9ccae3a0c0fb77325aa6 100644
--- a/MAC/APL/StationCU/src/StationControl/StationControl.cc
+++ b/MAC/APL/StationCU/src/StationControl/StationControl.cc
@@ -692,7 +692,7 @@ GCFEvent::TResult StationControl::operational_state(GCFEvent& event, GCFPortInte
 
 		// check if all actions for this event are finished.
 		vector<ChildControl::StateInfo>	cntlrStates = itsChildControl->getPendingRequest("", treeID);
-LOG_TRACE_FLOW_STR("There are " << cntlrStates.size() << " busy controllers");
+		LOG_TRACE_FLOW_STR("There are " << cntlrStates.size() << " busy controllers");
 		if (cntlrStates.empty()) {	// no pending requests? Ready.
 			if (event.signal != CONTROL_QUITED) {
 				sendControlResult(*itsParentPort, event.signal, cntlrName, CT_RESULT_NO_ERROR);