Lots of improvements; highlighting, more of a sketch of what things are going to be