small improvements (grabbed from HallMonitor)