Changes in general, some comments some styling.