some control structure issues were addressed