change lval struct and some other shit