correct branch logic in original pipelined deisgn. further simplify circuit. correct bypassing bug