Cleanup and update CHANGELOG and README