Updated change log and some minor tweaks