Effect +. and some logic fix