a few more changes based on feedback