Various updates

Updates to allow shorter URLs