fixed persistent underline issue. code needs major cleanup