Corrected a few more small errors, enhanced the generated program
Authored by: arjenmarkus 2008-09-30
Parent: [r228]
Child: [r230]
