Cleanup
Update ChangeLog
Update documentation