Pull request - various updates