fixed the ugly comma bug; still unsure of the ultimate solution