Update change log and style fixes