fixed bugs where we were hard-wired to internal values