Completed enhancement #436 - highlight row/column headers, general code clean-up,