Attempted to fix issues from meeting

Fixed problems in the user stories Ian discussed during meeting today.