Updated error highlight and made minor changes