v.128

Small bugs fixed