Bring Conv and patch into sync and place in cond prob range

Bug Fixes, added self tests
Bring conv and patch into sync.
Add cond prob semantics to conv/patch.