eek. i forgot about this code. your additions are good, but we need to revisit this in theming.