Fixed compile errors/switched to union data type for control data.