Add some more logging and fix name highlighting