* Highlighting the correct answer
* Minor fixes
* NullRefException fixes