Minor bugfixes and TODOs.
Minor bugfixes and TODOs.

jacekburys/csmith,natgla/csmith,DmitryOlshansky/dsmith,Panos90/csmith,jacekburys/csmith,Panos90/csmith,natgla/csmith,DmitryOlshansky/dsmith,DmitryOlshansky/dsmith,jacekburys/csmith,natgla/csmith,jacekburys/csmith,jacekburys/csmith,Panos90/csmith,natgla/csmith,Panos90/csmith,DmitryOlshansky/dsmith