Lots of minor and major changes.