Made some fixes
Updated change log