more statement stuff
adnapemit's fixes