Lots of small changes, looks better