fixed weights in error propagation
merge