Added a Semaphore to the tracking screen. Some other small improvements.