added more highlighting and some headers