Re: Pull request - various updates