Fixed minor issues with combine, encode and decode still left.