restoring my delegate mods to latest git pull
bug fix - out of bounds array call
code cleanup - standardizing spacing with id<delegate> pattern