bug fixes from earlier walkthrough