fixes

code cleanup; highlight panel