entropy coder changes, clean up, fixes