changes based on test feedback, pivotal fixes