fixed up a couple of hardcoding problems