fixes from running through the happy path