Updates, fixes and changes.