bug fixes and commenting out highlighting