added column highlight + fixes