From 91d42552c79c63db4c8fd7a0cdff5da46a106ea6 Mon Sep 17 00:00:00 2001
From: Anja <a.mueller-meissner@sharee.bike>
Date: Wed, 19 Apr 2023 12:14:14 +0200
Subject: [PATCH] Version 3.0.363

---
 .vsspell                                      |  17 ++
 IgnoredWords.dic                              |  11 +
 .../Properties/AndroidManifest.xml            |   2 +-
 LastenradBayern/TINK.iOS/Info.plist           |   4 +-
 .../TINK/View/Contact/ContactPage.xaml        |   2 +-
 .../TINK/View/FeedbackPopup.xaml.cs           |   6 +-
 .../TINK/View/Login/LoginPage.xaml            |   2 +-
 .../TINK/View/MyBikes/MyBikesPage.xaml.cs     |   2 +-
 .../TINK/View/RootFlyout/RootPage.xaml.cs     |  14 +-
 .../Services/BluetoothLock/BLE/LockItBase.cs  |  18 +-
 .../BluetoothLock/BLE/LockItEventBased.cs     |   4 +-
 .../BluetoothLock/BLE/LockItPolling.cs        |   4 +-
 .../BluetoothLock/BLE/LockItServiceBase.cs    |   6 +-
 .../Services/BluetoothLock/ILocksService.cs   |   4 +-
 .../Properties/AndroidManifest.xml            |   2 +-
 Meinkonrad/TINK.iOS/Info.plist                |   4 +-
 Meinkonrad/TINK/App.xaml                      |   7 +
 Meinkonrad/TINK/View/Bike/ILockItBike.xaml    | 272 ++++++++++++-----
 Meinkonrad/TINK/View/Contact/ContactPage.xaml |   6 +-
 Meinkonrad/TINK/View/FeedbackPopup.xaml.cs    |   6 +-
 .../TINK/View/MyBikes/MyBikesPage.xaml.cs     |   2 +-
 .../TINK/View/RootFlyout/RootPage.xaml.cs     |  14 +-
 TINK.sln                                      |   1 +
 .../Properties/AndroidManifest.xml            |   2 +-
 TINK/TINK.iOS/Info.plist                      |   4 +-
 TINK/TINK/App.xaml                            |   6 +-
 TINK/TINK/View/Bike/ILockItBike.xaml          | 280 +++++++++++-------
 TINK/TINK/View/Contact/ContactPage.xaml       |   6 +-
 TINK/TINK/View/FeedbackPopup.xaml.cs          |   6 +-
 TINK/TINK/View/MyBikes/MyBikesPage.xaml.cs    |   2 +-
 TINK/TINK/View/RootFlyout/RootPage.xaml.cs    |  14 +-
 TINKLib/Model/Bikes/BikeCollectionMutable.cs  |  14 +-
 TINKLib/Model/Bikes/BikeInfoNS/BC/BikeInfo.cs |  70 +----
 .../Bikes/BikeInfoNS/BC/BikeInfoMutable.cs    |  30 +-
 .../Bikes/BikeInfoNS/BC/IBikeInfoMutable.cs   |   5 +
 TINKLib/Model/Bikes/BikeInfoNS/BikeNS/Bike.cs |  20 +-
 .../BikeInfoNS/BluetoothLock/BikeInfo.cs      |  15 +-
 .../Bikes/BikeInfoNS/CopriLock/BikeInfo.cs    |  11 +-
 .../BikeInfoNS/CopriLock/BikeInfoMutable.cs   |   2 +-
 .../BikeInfoNS/DriveNS/BatteryNS/Battery.cs   |  14 +-
 .../BikeInfoNS/DriveNS/BatteryNS/IBattery.cs  |   6 +-
 TINKLib/Model/Bikes/IBikeCollection.cs        |   6 +-
 TINKLib/Model/Connector/Command/ICommand.cs   |   2 +-
 .../Connector/Command/UserFeedbackDto.cs      |   4 +-
 TINKLib/Model/Connector/FilteredConnector.cs  |  12 +-
 .../Model/Connector/NullFilterConnector.cs    |  12 +-
 TINKLib/Model/Connector/Query/CachedQuery.cs  |   4 +-
 .../Connector/Query/CachedQueryLoggedIn.cs    |   2 +-
 TINKLib/Model/Connector/Query/IQuery.cs       |   4 +-
 TINKLib/Model/Connector/Query/Query.cs        |   4 +-
 .../Model/Connector/Query/QueryLoggedIn.cs    |   2 +-
 TINKLib/Model/Connector/TextToTypeHelper.cs   |  32 +-
 .../Connector/Updater/BikeInfoFactory.cs      |  40 +--
 .../Model/Connector/Updater/UpdaterJSON.cs    |  15 +-
 TINKLib/Model/GroupFilterHelper.cs            |   4 +-
 TINKLib/Model/ITinkApp.cs                     |  14 +-
 .../Model/Logging/LoggingDirectoryManager.cs  |   6 +-
 TINKLib/Model/NullPostion.cs                  |   6 +-
 TINKLib/Model/PositionFactory.cs              |   2 +-
 .../Model/Settings/JsonSettingsDictionary.cs  |  12 +-
 TINKLib/Model/Settings/PollingParameters.cs   |   8 +-
 TINKLib/Model/Settings/Settings.cs            |  14 +-
 TINKLib/Model/State/StateInfoMutable.cs       |   4 +-
 .../StationCollection.cs                      |   7 +-
 .../StationNS}/IStation.cs                    |   6 +-
 .../StationNS}/NullStation.cs                 |   6 +-
 .../StationNS}/Operator/Data.cs               |   4 +-
 .../StationNS}/Operator/IData.cs              |   4 +-
 .../StationNS}/Station.cs                     |   6 +-
 TINKLib/Model/TinkApp.cs                      |  20 +-
 TINKLib/Model/User/Account/Account.cs         |  14 +-
 TINKLib/Model/WhatsNew.cs                     |  12 +-
 .../AppResources.Designer.cs                  |  25 +-
 .../AppResources.de.resx                      |  11 +-
 .../MultilingualResources/AppResources.resx   |  13 +-
 TINKLib/MultilingualResources/TINKLib.de.xlf  |  46 +--
 TINKLib/Repository/CopriCallsHttps.cs         |  27 +-
 TINKLib/Repository/CopriCallsMemory.cs        |  11 +-
 TINKLib/Repository/CopriCallsMonkeyStore.cs   |   1 +
 TINKLib/Repository/ICopriServer.cs            |   8 +-
 TINKLib/Repository/Request/IRequestBuilder.cs |   6 +-
 TINKLib/Repository/Request/RequestBuilder.cs  |   2 +-
 .../Request/RequestBuilderLoggedIn.cs         |   2 +-
 TINKLib/Repository/Response/BikeInfoBase.cs   |  10 +-
 TINKLib/Repository/Response/BikeType.cs       |   4 +-
 TINKLib/Repository/Response/ResponseHelper.cs |   4 +-
 .../Response/Stations/Station/OperatorData.cs |  27 ++
 .../Response/Stations/Station/StationInfo.cs  |  32 ++
 .../Stations/StationsAvailableResponse.cs     |  19 ++
 .../Response/StationsAvailableResponse.cs     |  69 -----
 .../BluetoothLock/LocksServiceInReach.cs      |   8 +-
 .../BluetoothLock/LocksServiceOutOfReach.cs   |   8 +-
 .../Services/CopriApi/CopriProviderHttps.cs   |  21 +-
 .../CopriApi/CopriProviderMonkeyStore.cs      |   1 +
 .../Services/CopriApi/ICachedCopriServer.cs   |   5 +-
 TINKLib/Services/CopriApi/ICopriCache.cs      |   1 +
 TINKLib/Services/CopriApi/Polling.cs          |   2 +-
 TINKLib/Services/CopriApi/Result.cs           |   4 +-
 .../CopriApi/StationsAndBikesContainer.cs     |   4 +-
 .../Geolocation/GeolocationService.cs         |   2 +-
 .../Geolocation/IGeolocationService.cs        |   3 +-
 .../LastKnownGeolocationService.cs            |   2 +-
 .../SimulatedGeolocationService.cs            |   2 +-
 TINKLib/View/IViewService.cs                  |   4 +-
 .../ViewModel/Account/AccountPageViewModel.cs |  10 +-
 .../Bike/BC/RequestHandler/Disposable.cs      |   6 +-
 .../Bikes/Bike/BC/RequestHandler/Reserved.cs  |   2 +-
 .../Bikes/Bike/BC/RequestHandlerFactory.cs    |   4 +-
 .../ViewModel/Bikes/Bike/BikeViewModelBase.cs |  12 +-
 .../Bikes/Bike/BluetoothLock/BikeViewModel.cs |  10 +
 .../RequestHandler/BookedClosed.cs            |  12 +-
 .../RequestHandler/BookedDisconnected.cs      |   2 +-
 .../RequestHandler/BookedOpen.cs              |  20 +-
 .../RequestHandler/BookedUnknown.cs           |   7 +-
 .../RequestHandler/DisposableDisconnected.cs  |  12 +-
 .../RequestHandler/DisposableOpen.cs          |  12 +-
 .../RequestHandler/ReservedClosed.cs          |  14 +-
 .../RequestHandler/ReservedDisconnected.cs    |  10 +-
 .../RequestHandler/ReservedOpen.cs            |  10 +-
 .../RequestHandler/ReservedUnknown.cs         |   8 +-
 .../BluetoothLock/RequestHandlerFactory.cs    |  16 +-
 .../CopriLock/RequestHandler/BookedClosed.cs  |   4 +-
 .../CopriLock/RequestHandler/BookedOpen.cs    |   4 +-
 .../RequestHandler/DisposableClosed.cs        |   8 +-
 .../RequestHandler/FeedbackPending.cs         |   8 +-
 .../RequestHandler/ReservedClosed.cs          |  10 +-
 .../Bikes/Bike/TariffDescriptionViewModel.cs  |  13 +-
 TINKLib/ViewModel/Bikes/BikesViewModel.cs     |  20 +-
 .../BikesAtStationPageViewModel.cs            |  11 +-
 .../ViewModel/Contact/ContactPageViewModel.cs |  17 +-
 .../Contact/SelectStationPageViewModel.cs     |  16 +-
 .../FeesAndBikes/FeesAndBikesPageViewModel.cs |   4 +-
 .../FindBike/FindBikePageViewModel.cs         |   8 +-
 .../BikeInfo/BikeInfoCarouselViewModel.cs     |   4 +-
 TINKLib/ViewModel/Info/InfoPageViewModel.cs   |   6 +-
 TINKLib/ViewModel/Login/LoginPageViewModel.cs |   4 +-
 TINKLib/ViewModel/Map/MapPageViewModel.cs     |  26 +-
 .../MiniSurvey/MiniSurveyViewModel.cs         |   4 +-
 TINKLib/ViewModel/MyBikes/MyBikeViewModel.cs  |   4 +-
 .../ViewModel/MyBikes/MyBikesPageViewModel.cs |   8 +-
 TINKLib/ViewModel/PollingUpdateTask.cs        |   4 +-
 TINKLib/ViewModel/PollingUpdateTaskManager.cs |   4 +-
 .../ViewModel/Settings/FilterItemMutable.cs   |   4 +-
 .../ViewModel/Settings/PollingViewModel.cs    |   8 +-
 .../Settings/SettingsPageViewModel.cs         |   2 +-
 TINKLib/ViewModel/ViewModelHelper.cs          |   2 +-
 .../ViewModel/WhatsNew/Agb/AgbViewModel.cs    |   2 +-
 .../ViewModel/WhatsNew/WhatsNewViewModel.cs   |   4 +-
 .../Repository/CopriCallMemoryBase.cs         |  30 +-
 .../Repository/CopriCallsMemory001.cs         |  13 +-
 TestFramework/Repository/ExceptionServer.cs   |   3 +-
 .../BluetoothLock/LocksServiceMock.cs         |   4 +-
 .../CopriApi/CopriCallsCacheMemory.cs         |   3 +-
 .../CopriApi/CopriCallsCacheMemory001.cs      |   3 +-
 TestLockItBLE/TestLockItBLE.csproj            |   4 +
 TestLockItShared/TestLockItShared.csproj      |   4 +
 TestSharee/TestSharee.csproj                  |   4 +
 TestSharee/UseCase/Startup/TestTinkApp.cs     |  14 +-
 .../Model/Bikes/BikeInfoNS/BC/TestBikeInfo.cs |  16 -
 .../BikeInfoNS/BC/TestBikeInfoMutable.cs      |  93 +-----
 .../Bikes/BikeInfoNS/BC/TestBikeMutable.cs    |   6 +-
 .../Bikes/BikeInfoNS/BC/TestBikeViewModel.cs  |   7 +-
 .../BikeInfoNS/BluetoothLock/TestBikeInfo.cs  |   9 +-
 .../CopriLock/TestBikeInfoMutable.cs          |  25 --
 .../BikeInfoNS/TestBikeCollectionMutable.cs   |  30 +-
 .../Model/Connector/TestCachedQuery.cs        |   1 +
 .../Connector/TestCachedQueryLoggedIn.cs      |   1 +
 .../Model/Connector/TestCopriCallsStatic.cs   |   8 +-
 .../Model/Connector/TestCopriProviderHttps.cs |   1 +
 TestShareeLib/Model/Connector/TestQuery.cs    |   3 +-
 .../Model/Connector/TestQueryLoggedIn.cs      |   3 +-
 .../Model/Connector/TestTextToTypeHelper.cs   |  69 +++--
 .../Connector/Updater/TestUpdaterJSON.cs      |  13 +-
 TestShareeLib/Model/Map/TestMapSpanFactory.cs |   6 +-
 TestShareeLib/Model/Station/TestData.cs       |   6 +-
 .../Model/Station/TestNullStation.cs          |   8 +-
 TestShareeLib/Model/Station/TestStation.cs    |  10 +-
 .../Model/TestBikeCollectionFilter.cs         |  61 +++-
 TestShareeLib/Model/TestNullPosition.cs       |  12 +-
 TestShareeLib/Model/TestPosition.cs           |  32 +-
 TestShareeLib/Model/TestPositionFactory.cs    |   2 +-
 .../Model/TestTinkAppSelectStation.cs         |   8 +-
 TestShareeLib/Model/TestWhatsNew.cs           |  12 +-
 .../Repository/Response/TestBikeInfoBase.cs   |  89 ++++++
 .../Repository/TestCopriCallsMonkeyStore.cs   |   1 +
 .../Repository/TestCopriCallsStatic.cs        |   6 +-
 .../BluetoothLock/Crypto/TestCryptoHelper.cs  |   8 +-
 TestShareeLib/TestShareeLib.csproj            |   4 +
 .../Bike/BC/TestBikeAtStationViewModel.cs     |   9 +-
 .../RequestHandler/TestBookedClosed.cs        |  42 +--
 .../RequestHandler/TestBookedDisconnected.cs  |  12 +-
 .../RequestHandler/TestBookedOpen.cs          |  40 +--
 .../RequestHandler/TestBookedUnknown.cs       |  34 +--
 .../TestDisposableDisconnected.cs             |  16 +-
 .../RequestHandler/TestDisposableOpen.cs      |  12 +-
 .../RequestHandler/TestReservedClosed.cs      |  34 +--
 .../TestReservedDisconnected.cs               |  22 +-
 .../RequestHandler/TestReservedOpen.cs        |  18 +-
 .../RequestHandler/TestReservedUnknown.cs     |  30 +-
 .../RequestHandler/TestBookedClosed.cs        |   6 +-
 .../RequestHandler/TestBookedOpen.cs          |   6 +-
 .../RequestHandler/TestDisposableClosed.cs    |  18 +-
 .../RequestHandler/TestFeedbackPending.cs     |   6 +-
 .../RequestHandler/TestReservedClosed.cs      |  18 +-
 .../Bikes/Bike/TestBikeViewModelFactory.cs    |  23 +-
 .../Bike/TestTariffDescriptionViewModel.cs    |  74 +++++
 .../TestBikesAtStationPageViewModel.cs        |  36 +--
 .../MyBikes/TestMyBikesPageViewModel.cs       |  10 +-
 .../Connector/CopriCallsHttpReference.cs      |   7 +-
 .../Connector/TestCopriCallsHttps.cs          |  16 +-
 .../ObjectTests/Connector/TestFilter.cs       |  10 +-
 en-US_User.dic                                |  21 ++
 212 files changed, 1799 insertions(+), 1318 deletions(-)
 create mode 100644 .vsspell
 create mode 100644 IgnoredWords.dic
 rename TINKLib/Model/{Station => Stations}/StationCollection.cs (94%)
 rename TINKLib/Model/{Station => Stations/StationNS}/IStation.cs (80%)
 rename TINKLib/Model/{Station => Stations/StationNS}/NullStation.cs (84%)
 rename TINKLib/Model/{Station => Stations/StationNS}/Operator/Data.cs (93%)
 rename TINKLib/Model/{Station => Stations/StationNS}/Operator/IData.cs (87%)
 rename TINKLib/Model/{Station => Stations/StationNS}/Station.cs (93%)
 create mode 100644 TINKLib/Repository/Response/Stations/Station/OperatorData.cs
 create mode 100644 TINKLib/Repository/Response/Stations/Station/StationInfo.cs
 create mode 100644 TINKLib/Repository/Response/Stations/StationsAvailableResponse.cs
 delete mode 100644 TINKLib/Repository/Response/StationsAvailableResponse.cs
 create mode 100644 TestShareeLib/Repository/Response/TestBikeInfoBase.cs
 create mode 100644 en-US_User.dic

diff --git a/.vsspell b/.vsspell
new file mode 100644
index 0000000..4de3b8d
--- /dev/null
+++ b/.vsspell
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Visual Studio Spell Checker configuration file - [https://github.com/EWSoftware/VSSpellChecker]
+     Do not edit the XML.  Use the configuration file editor in Visual Studio to modify the settings. -->
+<SpellCheckerConfiguration Format="2018.8.16.0">
+  <InheritAdditionalDictionaryFolders>True</InheritAdditionalDictionaryFolders>
+  <AdditionalDictionaryFolders>
+    <Folder>.\\</Folder>
+  </AdditionalDictionaryFolders>
+  <SelectedLanguages />
+  <InheritIgnoredClassifications>True</InheritIgnoredClassifications>
+  <IgnoredClassifications />
+  <InheritIgnoredWords>True</InheritIgnoredWords>
+  <IgnoredWordsFile>IgnoredWords.dic</IgnoredWordsFile>
+  <InheritExclusionExpressions>True</InheritExclusionExpressions>
+  <InheritIgnoredFilePatterns>True</InheritIgnoredFilePatterns>
+  <InheritXmlSettings>True</InheritXmlSettings>
+</SpellCheckerConfiguration>
\ No newline at end of file
diff --git a/IgnoredWords.dic b/IgnoredWords.dic
new file mode 100644
index 0000000..dd9ac93
--- /dev/null
+++ b/IgnoredWords.dic
@@ -0,0 +1,11 @@
+cts
+Darmstadt
+enum
+Freiburg
+haveltec
+javaminister
+konrad
+Mein
+sharee
+tink
+xdoc
diff --git a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
index 6aecb5c..56cc448 100644
--- a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
+++ b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.LastenradBayern" android:versionName="3.0.362" android:versionCode="362">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.LastenradBayern" android:versionName="3.0.363" android:versionCode="363">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31" />
 	<!-- Google Maps related permissions -->
 	<!-- Permission to receive remote notifications from Google Play Services -->
diff --git a/LastenradBayern/TINK.iOS/Info.plist b/LastenradBayern/TINK.iOS/Info.plist
index d39ac4d..82e88d6 100644
--- a/LastenradBayern/TINK.iOS/Info.plist
+++ b/LastenradBayern/TINK.iOS/Info.plist
@@ -56,8 +56,8 @@
 	<key>CFBundleDisplayName</key>
 	<string>LastenradBayern</string>
 	<key>CFBundleVersion</key>
-	<string>362</string>
+	<string>363</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.362</string>
+	<string>3.0.363</string>
 </dict>
 </plist>
diff --git a/LastenradBayern/TINK/View/Contact/ContactPage.xaml b/LastenradBayern/TINK/View/Contact/ContactPage.xaml
index c3abaeb..7cce371 100644
--- a/LastenradBayern/TINK/View/Contact/ContactPage.xaml
+++ b/LastenradBayern/TINK/View/Contact/ContactPage.xaml
@@ -66,7 +66,7 @@
                     <Frame>
                         <StackLayout>
                             <Label FormattedText="{Binding LikeTinkApp}"/>
-                            <!--- Mail to app- releated support -->
+                            <!--- Mail to app- related support -->
                             <Button
                                 Text="{x:Static resources:AppResources.ActionContactMailAppReleated}"
                                 IsEnabled="{Binding IsSendMailAvailable}"
diff --git a/LastenradBayern/TINK/View/FeedbackPopup.xaml.cs b/LastenradBayern/TINK/View/FeedbackPopup.xaml.cs
index 2c73611..bd1b32f 100644
--- a/LastenradBayern/TINK/View/FeedbackPopup.xaml.cs
+++ b/LastenradBayern/TINK/View/FeedbackPopup.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
 using Xamarin.CommunityToolkit.UI.Views;
 using Xamarin.Forms.Xaml;
@@ -69,7 +69,7 @@ namespace TINK.View
 #endif
 		{
 			/// <summary>
-			/// Holds the current chargeing level of the battery entered by user in bars, null if unkonwn.
+			/// Holds the current charging level of the battery entered by user in bars, null if unknown.
 			/// </summary>
 			public int? CurrentChargeBars { get; set; }
 
@@ -87,4 +87,4 @@ namespace TINK.View
 			public string Message { get; set; }
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/LastenradBayern/TINK/View/Login/LoginPage.xaml b/LastenradBayern/TINK/View/Login/LoginPage.xaml
index 72cf9ea..ff51b5a 100644
--- a/LastenradBayern/TINK/View/Login/LoginPage.xaml
+++ b/LastenradBayern/TINK/View/Login/LoginPage.xaml
@@ -24,7 +24,7 @@
                                 x:Name="EMailEntry" 
                                 Text="{Binding MailAddress}"
                                 IsEnabled="{Binding IsLoggedOut}"/>
-                        <Label Text="{x:Static resources:AppResources.MarkingLoginPasswordLabel}"/>
+						<Label Text="{x:Static resources:AppResources.MarkingLoginPasswordPlaceholder}"/>
 						<Entry 
                                 Placeholder="{x:Static resources:AppResources.MarkingLoginPasswordPlaceholder}" 
                                 AutomationId="password_text"
diff --git a/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml.cs b/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml.cs
index 0efb430..75c265c 100644
--- a/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml.cs
+++ b/LastenradBayern/TINK/View/MyBikes/MyBikesPage.xaml.cs
@@ -100,7 +100,7 @@ namespace TINK.View.MyBikes
 		{
 			if (m_oViewModel == null)
 			{
-				// View model might be null (Example: Occured when page to querry for location permissions was opened)
+				// View model might be null (Example: Occured when page to query for location permissions was opened)
 				return;
 			}
 
diff --git a/LastenradBayern/TINK/View/RootFlyout/RootPage.xaml.cs b/LastenradBayern/TINK/View/RootFlyout/RootPage.xaml.cs
index 7a0ecd0..6ebc793 100644
--- a/LastenradBayern/TINK/View/RootFlyout/RootPage.xaml.cs
+++ b/LastenradBayern/TINK/View/RootFlyout/RootPage.xaml.cs
@@ -1,5 +1,5 @@
-using System;
-using TINK.Model.Station;
+using System;
+using TINK.Model.Stations;
 #if USEFLYOUT
 using TINK.View.MasterDetail;
 #endif
@@ -9,12 +9,12 @@ using Xamarin.Forms.Xaml;
 namespace TINK.View.Root
 {
 	/// <summary>
-	/// Mamages creation of detail pages if a flyout page menu entry is selected.
+	/// Manages creation of detail pages if a flyout page menu entry is selected.
 	/// Exposes flyout page style navigation which is used by detail pages.
 	/// </summary>
 	/// <remarks>
 	/// Examples of use cases when detail pages do navigation:
-	// - switch to map page after succesfully logging in/ logging out
+	// - switch to map page after successfully logging in/ logging out
 	// - switch to login page form bikes at station page if not yet logged in
 	/// </remarks>
 	[XamlCompilation(XamlCompilationOptions.Compile)]
@@ -29,7 +29,7 @@ namespace TINK.View.Root
 			InitializeComponent();
 			FlyoutPage.ListView.ItemSelected += OnListViewItemSelected;
 
-			// Any type of split behaviour conflics with map shifting functionality (assuming FlyoutPage behaves same like MasterDetailPage).
+			// Any type of split behavior conflicts with map shifting functionality (assuming FlyoutPage behaves same like MasterDetailPage).
 			FlyoutLayoutBehavior = FlyoutLayoutBehavior.Popover;
 
 			var navigationPage = Detail as NavigationPage;
@@ -62,7 +62,7 @@ namespace TINK.View.Root
 			}
 
 			// Set selected station to new 
-			App.ModelRoot.SelectedStation = new NullStation();
+			App.ModelRoot.SelectedStation = new TINK.Model.Stations.StationNS.NullStation();
 
 			ShowPage(item.TargetType, item.Title);
 
@@ -92,4 +92,4 @@ namespace TINK.View.Root
 			Detail = new NavigationPage(page);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/LockItBLE/Services/BluetoothLock/BLE/LockItBase.cs b/LockItBLE/Services/BluetoothLock/BLE/LockItBase.cs
index e435072..8c30478 100644
--- a/LockItBLE/Services/BluetoothLock/BLE/LockItBase.cs
+++ b/LockItBLE/Services/BluetoothLock/BLE/LockItBase.cs
@@ -441,7 +441,7 @@ namespace TINK.Services.BluetoothLock.BLE
 			if (authInfo.K_seed.Length != SEEDLENGTH
 				|| authInfo.K_u.Length <= 0)
 			{
-				throw new AuthKeyException($"Can not authenticate. Invalid seed-/ k-user-lenght {authInfo.K_seed.Length}/ {authInfo.K_u.Length} detected.");
+				throw new AuthKeyException($"Can not authenticate. Invalid seed-/ k-user-length {authInfo.K_seed.Length}/ {authInfo.K_u.Length} detected.");
 			}
 
 			if (Device.State == Plugin.BLE.Abstractions.DeviceState.Connected)
@@ -551,7 +551,7 @@ namespace TINK.Services.BluetoothLock.BLE
 			if (authInfo.K_seed.Length != SEEDLENGTH
 				|| authInfo.K_u.Length <= 0)
 			{
-				throw new AuthKeyException($"Can not authenticate. Invalid seed-/ k-user-lenght {authInfo.K_seed.Length}/ {authInfo.K_u.Length} detected.");
+				throw new AuthKeyException($"Can not authenticate. Invalid seed-/ k-user-length {authInfo.K_seed.Length}/ {authInfo.K_u.Length} detected.");
 			}
 
 			Log.ForContext<LockItBase>().Debug($"Connection state is {deviceState} in context of auth.");
@@ -636,11 +636,11 @@ namespace TINK.Services.BluetoothLock.BLE
 			cts.CancelAfter(READ_TIMEOUT_MS);
 			try
 			{
-				seedLockEncrypted = await authCharacteristic.ReadAsync(cts.Token); // encrypted seed value (random value) from lock to decypt using k_user
+				seedLockEncrypted = await authCharacteristic.ReadAsync(cts.Token); // encrypted seed value (random value) from lock to decrypt using k_user
 			}
 			catch (System.Exception exception)
 			{
-				Log.ForContext<LockItBase>().Error("Retrieveing encrypted random value from lock (seed)(ReadAsync-call) failed.{ReadCharacteristic}{Exception}", ToSerilogString(authCharacteristic), exception);
+				Log.ForContext<LockItBase>().Error("Retrieving encrypted random value from lock (seed)(ReadAsync-call) failed.{ReadCharacteristic}{Exception}", ToSerilogString(authCharacteristic), exception);
 				throw new System.Exception(string.Format("Can not authenticate. Reading encrypted seed failed. {0}", exception.Message), exception);
 			}
 			finally
@@ -648,7 +648,7 @@ namespace TINK.Services.BluetoothLock.BLE
 				cts.Dispose();
 			}
 
-			Log.ForContext<LockItBase>().Debug("Retrieveing encrypted random value from lock (seed)(ReadAsync-call) succeeded.{ReadCharacteristic}{Reading}", ToSerilogString(authCharacteristic), "***");
+			Log.ForContext<LockItBase>().Debug("Retrieving encrypted random value from lock (seed)(ReadAsync-call) succeeded.{ReadCharacteristic}{Reading}", ToSerilogString(authCharacteristic), "***");
 
 			var crypto = new AuthCryptoHelper(
 				seedLockEncrypted,
@@ -701,7 +701,7 @@ namespace TINK.Services.BluetoothLock.BLE
 		/// <exception cref="BluetoothDisconnectedException">App is not connected to lock.</exception>
 		/// <exception cref="CoundntGetCharacteristicException">Getting state characteristic to read from failed.</exception>
 		/// <exception cref="Exception">
-		/// Call not from main thread or unkonwn platform detected or
+		/// Call not from main thread or unknown platform detected or
 		/// query device state (connected, disconnected, ....) failed for an unknown reason or returned an unexpected value or
 		/// reading state characteristic failed or reading from characteristic was empty.
 		/// </exception>
@@ -1044,8 +1044,8 @@ namespace TINK.Services.BluetoothLock.BLE
 			{
 				ActivateLockWriteCounter--;
 				Log.ForContext<LockItBase>().Error(open
-						? "Encypting command to open lock failed. {Exception}"
-						: "Encypting command to close lock failed. {Exception}",
+						? "Encrypting command to open lock failed. {Exception}"
+						: "Encrypting command to close lock failed. {Exception}",
 					exception);
 				throw new System.Exception(open
 						? $"Can not open lock. Encrypting command to lock/ unlock failed. {exception.Message}"
@@ -1251,6 +1251,6 @@ namespace TINK.Services.BluetoothLock.BLE
 			=> charcteristic.Id.ToString();
 
 		private static string ToSerilogString(byte[] byteArray)
-			=> "***"; // For debuging purposes it might be reqired to return string.Join(",", byteArray); Do not log any confidental value in production context.
+			=> "***"; // For debugging purposes it might be required to return string.Join(",", byteArray); Do not log any confidental value in production context.
 	}
 }
diff --git a/LockItBLE/Services/BluetoothLock/BLE/LockItEventBased.cs b/LockItBLE/Services/BluetoothLock/BLE/LockItEventBased.cs
index 2a8d86b..c7c1c23 100644
--- a/LockItBLE/Services/BluetoothLock/BLE/LockItEventBased.cs
+++ b/LockItBLE/Services/BluetoothLock/BLE/LockItEventBased.cs
@@ -162,7 +162,7 @@ namespace TINK.Services.BluetoothLock.BLE
 					// - LockitLockingState.Closed 
 					// - LockitLockingState.Unknown
 					// - LockitLockingState.CouldntOpenBoldBlocked
-					// Internal error which sould never occure. Lock refuses to open but connection is ok.
+					// Internal error which should never occur. Lock refuses to open but connection is ok.
 					Log.ForContext<LockItEventBased>().Debug($"Opening lock failed. Unexpected lock state {lockingState.Value.GetLockingState()} detected.");
 					throw new CouldntOpenInconsistentStateExecption(lockingState.Value.GetLockingState());
 			}
@@ -280,7 +280,7 @@ namespace TINK.Services.BluetoothLock.BLE
 					// - LockitLockingState.Open 
 					// - LockitLockingState.Unknown
 					// - LockitLockingState.CouldntOpenBoldBlocked
-					// Internal error which sould never occurre. Lock refuses to close but connection is ok.                    
+					// Internal error which should never occur. Lock refuses to close but connection is ok.                    
 					Log.ForContext<LockItEventBased>().Debug($"Opening lock failed. Unexpected lock state {lockingState.Value.GetLockingState()} detected.");
 					throw new CouldntCloseInconsistentStateExecption(lockingState.Value.GetLockingState());
 			}
diff --git a/LockItBLE/Services/BluetoothLock/BLE/LockItPolling.cs b/LockItBLE/Services/BluetoothLock/BLE/LockItPolling.cs
index a79f28b..f665a60 100644
--- a/LockItBLE/Services/BluetoothLock/BLE/LockItPolling.cs
+++ b/LockItBLE/Services/BluetoothLock/BLE/LockItPolling.cs
@@ -128,7 +128,7 @@ namespace TINK.Services.BluetoothLock.BLE
 					// - LockitLockingState.Closed 
 					// - LockitLockingState.CouldntCloseMoving (should never happen because command open was send)
 					// - LockitLockingState.CouldntCloseBoldBlocked (should never happen because command open was send)
-					// Internal error which sould never occure. Lock refuses to open but connection is ok.
+					// Internal error which should never occur. Lock refuses to open but connection is ok.
 					Log.ForContext<LockItPolling>().Debug($"Opening lock failed. Unexpected lock state {info.State.Value.GetLockingState()} detected.");
 					throw new CouldntOpenInconsistentStateExecption(info.State.Value.GetLockingState());
 			}
@@ -235,7 +235,7 @@ namespace TINK.Services.BluetoothLock.BLE
 					// - LockitLockingState.Open 
 					// - LockitLockingState.Unknown
 					// - LockitLockingState.CouldntOpenBoldBlocked
-					// Internal error which sould never occurre. Lock refuses to close but connection is ok.
+					// Internal error which should never occur. Lock refuses to close but connection is ok.
 					Log.ForContext<LockItPolling>().Debug($"Closing lock failed. Unexpected lock state {info.State.Value.GetLockingState()} detected.");
 					throw new CouldntCloseInconsistentStateExecption(info.State.Value.GetLockingState());
 			}
diff --git a/LockItBLE/Services/BluetoothLock/BLE/LockItServiceBase.cs b/LockItBLE/Services/BluetoothLock/BLE/LockItServiceBase.cs
index 746d9cb..37c6df9 100644
--- a/LockItBLE/Services/BluetoothLock/BLE/LockItServiceBase.cs
+++ b/LockItBLE/Services/BluetoothLock/BLE/LockItServiceBase.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -20,7 +20,7 @@ namespace TINK.Services.BluetoothLock.BLE
 			Cipher = cipher;
 		}
 
-		/// <summary> Holds timeout values for series of connecting attemps to a lock or multiple locks. </summary>
+		/// <summary> Holds timeout values for series of connecting attempts to a lock or multiple locks. </summary>
 		public ITimeOutProvider TimeOut { get; set; }
 
 		protected ICipher Cipher { get; }
@@ -179,4 +179,4 @@ namespace TINK.Services.BluetoothLock.BLE
 			return LockingState.UnknownDisconnected;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/LockItShared/Services/BluetoothLock/ILocksService.cs b/LockItShared/Services/BluetoothLock/ILocksService.cs
index 96c5d8c..5f6bdd5 100644
--- a/LockItShared/Services/BluetoothLock/ILocksService.cs
+++ b/LockItShared/Services/BluetoothLock/ILocksService.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
@@ -8,7 +8,7 @@ namespace TINK.Services.BluetoothLock
 {
 	public interface ILocksService
 	{
-		/// <summary> Holds timeout values for series of connecting attemps to a lock or multiple locks. </summary>
+		/// <summary> Holds timeout values for series of connecting attempts to a lock or multiple locks. </summary>
 		ITimeOutProvider TimeOut { get; set; }
 
 		/// <summary> Gets lock info for all lock in reach./// </summary>
diff --git a/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml b/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
index a1080a1..fe6de9b 100644
--- a/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
+++ b/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.Meinkonrad" android:versionName="3.0.362" android:versionCode="362">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.Meinkonrad" android:versionName="3.0.363" android:versionCode="363">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31" />
 	<!-- Google Maps related permissions -->
 	<!-- Permission to receive remote notifications from Google Play Services -->
diff --git a/Meinkonrad/TINK.iOS/Info.plist b/Meinkonrad/TINK.iOS/Info.plist
index c28e191..2c73655 100644
--- a/Meinkonrad/TINK.iOS/Info.plist
+++ b/Meinkonrad/TINK.iOS/Info.plist
@@ -56,8 +56,8 @@
 	<key>CFBundleDisplayName</key>
 	<string>Mein konrad</string>
 	<key>CFBundleVersion</key>
-	<string>362</string>
+	<string>363</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.362</string>
+	<string>3.0.363</string>
 </dict>
 </plist>
diff --git a/Meinkonrad/TINK/App.xaml b/Meinkonrad/TINK/App.xaml
index 005e31f..0b3695c 100644
--- a/Meinkonrad/TINK/App.xaml
+++ b/Meinkonrad/TINK/App.xaml
@@ -30,6 +30,13 @@
 			<!--Arrow down from line-->
 			<x:String x:Key="ArrowDown">&#xf063;</x:String>
 
+			<!--Info in Circle-->
+			<x:String x:Key="InfoCircle">&#xf05a;</x:String>
+
+			<!--AaAbRideType-->
+			<x:String x:Key="LocationPin">&#xf3c5;</x:String>
+			<x:String x:Key="ArrowReturnBack">&#xf0e2;</x:String>
+
 			<!-- Add more resources here -->
             <ResourceDictionary.MergedDictionaries>
                 <!-- Add more resource dictionaries here -->
diff --git a/Meinkonrad/TINK/View/Bike/ILockItBike.xaml b/Meinkonrad/TINK/View/Bike/ILockItBike.xaml
index 35acb27..105354f 100644
--- a/Meinkonrad/TINK/View/Bike/ILockItBike.xaml
+++ b/Meinkonrad/TINK/View/Bike/ILockItBike.xaml
@@ -12,6 +12,7 @@
         <ContentView.Resources>
             <conv:StringNotNullOrEmptyToVisibleConverter x:Key="Label_Converter"/>
         </ContentView.Resources>
+
 		<Frame
 				Padding="10"
 				Margin="0,5,0,5"
@@ -23,75 +24,157 @@
 					Orientation="Vertical"
 					Padding="10">
 
-				<!-- Icons, Name, ID -->
-				<Grid Padding="0,0,5,10"
+				<!-- Icons, Name, ID, ... -->
+				<Grid
+					Padding="0"
+					RowSpacing="15"
+					ColumnSpacing="5"
 					ColumnDefinitions="Auto,Auto,*"
-					RowDefinitions="Auto,Auto">
+					RowDefinitions="Auto,Auto,Auto">
 
-					<!-- Icon of the bike -->
+					<!-- Bike image -->
 					<Image
-						Grid.Column="0"
-						Grid.Row="0"
-						Grid.RowSpan="2"
-						Source="{Binding DisplayedBikeImageSourceString}"
-						HeightRequest="60"
-						Aspect="AspectFit"
-						HorizontalOptions="Start"
-						VerticalOptions="End"/>
+							Grid.Column="0"
+							Grid.Row="0"
+							Grid.RowSpan="2"
+							VerticalOptions="End"
+							Source="{Binding DisplayedBikeImageSourceString}"
+							HeightRequest="60"
+							Aspect="AspectFit"/>
 
-					<!-- Battery level -->
+					<!-- Battery level image -->
 					<sharedGui:BarLevelView
-						Grid.Column="1"
-						Grid.Row="1"
-						Current="{Binding CurrentChargeBars}"
-						Maximum="{Binding MaxChargeBars}"
-						VerticalOptions="End"
-						IsVisible="{Binding IsBatteryChargeVisible}"/>
+							Grid.Column="1"
+							Grid.Row="0"
+							Grid.RowSpan="2"
+							VerticalOptions="End"
+							Current="{Binding CurrentChargeBars}"
+							Maximum="{Binding MaxChargeBars}"
+							IsVisible="{Binding IsBatteryChargeVisible}"/>
 
-					<!-- Name of the bike -->
-					<Label
+					<!-- Rental state and error -->
+					<StackLayout
+						Grid.Column="0"
+						Grid.ColumnSpan="2"
+						Grid.Row="2"
+						Spacing="0"
+						Orientation="Vertical"
+						HorizontalOptions="Start"
+						VerticalOptions="End">
+
+						<!-- Rental state -->
+						<Label
+							Text="{Binding StateText}"
+							FontSize="Small"
+							TextColor="{Binding StateColor}"/>
+
+						<!-- Rental state error info -->
+						<Label
+							Text="{Binding ErrorText}"
+							FontSize="Small"
+							IsVisible="{Binding ErrorText, Converter={StaticResource Label_Converter}}"
+							TextColor="Red"/>
+
+					</StackLayout>
+
+					<!-- Name and Id of the bike -->
+					<StackLayout
 						Grid.Column="1"
 						Grid.ColumnSpan="2"
 						Grid.Row="0"
-						FontAttributes="Bold"
-						FontSize="Large"
-						HorizontalTextAlignment="Right"
-						Text="{Binding Name}"/>
+						Orientation="Vertical"
+						VerticalOptions="Start"
+						HorizontalOptions="End"
+						Spacing="0">
 
-					<!-- Id of the bike -->
-					<Label
+						<!-- Name -->
+						<Label
+							FontAttributes="Bold"
+							FontSize="Large"
+							TextColor="Black"
+							HorizontalTextAlignment="Right"
+							Text="{Binding Name}"/>
+
+						<!-- Id -->
+						<Label
+							TextColor="DimGray"
+							FontAttributes="Bold"
+							HorizontalTextAlignment="Right"
+							IsVisible="{Binding DisplayId, Converter={StaticResource Label_Converter}}"
+							Text="{Binding DisplayId}"/>
+
+					</StackLayout>
+
+					<!-- AaAbRideType -->
+					<StackLayout
 						Grid.Column="2"
 						Grid.Row="1"
-						FontAttributes="Bold"
-						HorizontalTextAlignment="Right"
-						IsVisible="{Binding DisplayId, Converter={StaticResource Label_Converter}}"
-						Text="{Binding DisplayId}"/>
+						Grid.RowSpan="2"
+						Spacing="0"
+						HorizontalOptions="End"
+						VerticalOptions="End"
+						IsVisible="{Binding AaRideType}">
+						<StackLayout
+							Orientation="Horizontal"
+							HorizontalOptions="End">
+							<Image>
+								<Image.Source>
+									<FontImageSource
+									Glyph="{StaticResource LocationPin}"
+									Color="Black"
+									FontFamily="FA-S"
+									Size="20"/>
+								</Image.Source>
+							</Image>
+							<Image>
+								<Image.Source>
+									<FontImageSource
+									Glyph="{StaticResource ArrowReturnBack}"
+									Color="Black"
+									FontFamily="FA-S"
+									Size="20"/>
+								</Image.Source>
+							</Image>
+							<Button
+								Command="{Binding ShowRideTypeInfoCommand}"
+								WidthRequest="24"
+								HeightRequest="24"
+								BackgroundColor="Transparent"
+								BorderWidth="0"
+								Padding="0"
+								Margin="5,0,0,0">
+								<Button.ImageSource>
+									<FontImageSource
+									Glyph="{StaticResource InfoCircle}"
+									Color="DimGray"
+									FontFamily="FA-S"
+									Size="20"/>
+								</Button.ImageSource>
+							</Button>
+						</StackLayout>
+						<Label 
+								Text= "{Binding StationId}"
+								FontSize="Small"
+								HorizontalOptions="End"/>
+					</StackLayout>
 
 				</Grid>
 
-				<!-- Rental state -->
-				<Label 
-						Text="{Binding StateText}"
-						TextColor="{Binding StateColor}"/>
-				<Label 
-						Text="{Binding ErrorText}"
-						IsVisible="{Binding ErrorText, Converter={StaticResource Label_Converter}}"
-						TextColor="Red"/>
-
 				<!-- Buttons -->
 				<Button 
-						Text="{Binding ButtonText}"
-						IsVisible="{Binding IsButtonVisible}"
-						Command="{Binding OnButtonClicked}"/>
+					Text="{Binding ButtonText}"
+					IsVisible="{Binding IsButtonVisible}"
+					Command="{Binding OnButtonClicked}"/>
 				<Button
-						Style="{StaticResource SecondaryButton}"
-						Text="{Binding LockitButtonText}"
-						IsVisible="{Binding IsLockitButtonVisible}"
-						Command="{Binding OnLockitButtonClicked}"/>
+					Style="{StaticResource SecondaryButton}"
+					Text="{Binding LockitButtonText}"
+					IsVisible="{Binding IsLockitButtonVisible}"
+					Command="{Binding OnLockitButtonClicked}"/>
+
 				<!-- Rental description (tarif name, options and rental info -->
 				<Grid
-                RowSpacing="0" 
-                IsVisible="{Binding TariffDescription.Header, Converter={StaticResource Label_Converter}}">
+					RowSpacing="0" 
+					IsVisible="{Binding TariffDescription.Header, Converter={StaticResource Label_Converter}}">
 					<Grid.RowDefinitions>
 						<!-- start tarif- entries -->
 						<RowDefinition Height="Auto" />
@@ -115,19 +198,52 @@
 					<Grid.ColumnDefinitions>
 						<ColumnDefinition Width="Auto" />
 						<ColumnDefinition Width="*" />
+						<ColumnDefinition Width="Auto" />
 					</Grid.ColumnDefinitions>
+
 					<!-- start tarif- entries (should be a CollectionView) -->
 					<Label 
-                    Text= "{x:Static resources:AppResources.MessageBikesManagementTariffDescriptionTariffHeader}"
-                    IsVisible="{Binding TariffDescription.Header, Converter={StaticResource Label_Converter}}"
-                    Grid.Row="0" 
-                    FontAttributes="Bold"/>
+						Text= "{x:Static resources:AppResources.MessageBikesManagementTariffDescriptionTariffHeader}"
+						IsVisible="{Binding TariffDescription.Header, Converter={StaticResource Label_Converter}}"
+						Grid.Row="0" 
+						FontAttributes="Bold"/>
 					<Label 
-                    Text="{Binding TariffDescription.Header}"
-                    IsVisible="{Binding TariffDescription.Header, Converter={StaticResource Label_Converter}}"
-                    Grid.Row="0" 
-                    Grid.Column="1"
-                    FontAttributes="Bold"/>
+						Text="{Binding TariffDescription.Header}"
+						IsVisible="{Binding TariffDescription.Header, Converter={StaticResource Label_Converter}}"
+						Grid.Row="0" 
+						Grid.Column="1"
+						FontAttributes="Bold"/>
+
+					<!--Tracking-->
+					<Grid
+						Grid.Row="0"
+						Grid.Column="1"
+						Grid.ColumnSpan="2"
+						ColumnDefinitions="*,Auto"
+						IsVisible="{Binding TariffDescription.TrackingInfoText, Converter={StaticResource Label_Converter}}">
+						<Label 
+							Text= "Tracking"
+							Grid.Column="0"
+							HorizontalOptions="End"/>
+						<Button
+							Command="{Binding ShowTrackingInfoCommand}"
+							WidthRequest="24"
+							HeightRequest="24"
+							BackgroundColor="Transparent"
+							BorderWidth="0"
+							Grid.Column="1"
+							Padding="0"
+							Margin="0">
+							<Button.ImageSource>
+								<FontImageSource
+									Glyph="{StaticResource InfoCircle}"
+									Color="DimGray"
+									FontFamily="FA-S"
+									Size="20"/>
+							</Button.ImageSource>
+						</Button>
+					</Grid>
+
 					<Label 
                     Text= "{Binding TariffDescription.TarifEntry1.Description}"
                     IsVisible="{Binding TariffDescription.TarifEntry1.Description, Converter={StaticResource Label_Converter}}"
@@ -136,7 +252,8 @@
                     Text="{Binding TariffDescription.TarifEntry1.Value}"
                     IsVisible="{Binding TariffDescription.TarifEntry1.Value, Converter={StaticResource Label_Converter}}"
                     Grid.Row="1" 
-                    Grid.Column="1"/>
+                    Grid.Column="1"
+					Grid.ColumnSpan="2"/>
 					<Label 
                     Text= "{Binding TariffDescription.TarifEntry2.Description}"
                     IsVisible="{Binding TariffDescription.TarifEntry2.Description, Converter={StaticResource Label_Converter}}"
@@ -145,7 +262,8 @@
                     Text="{Binding TariffDescription.TarifEntry2.Value}"
                     IsVisible="{Binding TariffDescription.TarifEntry2.Value, Converter={StaticResource Label_Converter}}"
                     Grid.Row="2" 
-                    Grid.Column="1"/>
+                    Grid.Column="1"
+					Grid.ColumnSpan="2"/>
 					<Label 
                     Text= "{Binding TariffDescription.TarifEntry3.Description}"
                     IsVisible="{Binding TariffDescription.TarifEntry3.Description, Converter={StaticResource Label_Converter}}"
@@ -154,7 +272,8 @@
                     Text="{Binding TariffDescription.TarifEntry3.Value}"
                     IsVisible="{Binding TariffDescription.TarifEntry3.Value, Converter={StaticResource Label_Converter}}"
                     Grid.Row="3" 
-                    Grid.Column="1"/>
+                    Grid.Column="1"
+					Grid.ColumnSpan="2"/>
 					<Label 
                     Text= "{Binding TariffDescription.TarifEntry4.Description}"
                     IsVisible="{Binding TariffDescription.TarifEntry4.Description, Converter={StaticResource Label_Converter}}"
@@ -163,7 +282,8 @@
                     Text="{Binding TariffDescription.TarifEntry4.Value}"
                     IsVisible="{Binding TariffDescription.TarifEntry4.Value, Converter={StaticResource Label_Converter}}"
                     Grid.Row="4" 
-                    Grid.Column="1"/>
+                    Grid.Column="1"
+					Grid.ColumnSpan="2"/>
 					<Label 
                     Text= "{Binding TariffDescription.TarifEntry5.Description}"
                     IsVisible="{Binding TariffDescription.TarifEntry5.Description, Converter={StaticResource Label_Converter}}"
@@ -172,7 +292,8 @@
                     Text="{Binding TariffDescription.TarifEntry5.Value}"
                     IsVisible="{Binding TariffDescription.TarifEntry5.Value, Converter={StaticResource Label_Converter}}"
                     Grid.Row="5" 
-                    Grid.Column="1"/>
+                    Grid.Column="1"
+					Grid.ColumnSpan="2"/>
 					<Label 
                     Text= "{Binding TariffDescription.TarifEntry6.Description}"
                     IsVisible="{Binding TariffDescription.TarifEntry6.Description, Converter={StaticResource Label_Converter}}"
@@ -181,7 +302,8 @@
                     Text="{Binding TariffDescription.TarifEntry6.Value}"
                     IsVisible="{Binding TariffDescription.TarifEntry6.Value, Converter={StaticResource Label_Converter}}"
                     Grid.Row="6" 
-                    Grid.Column="1"/>
+                    Grid.Column="1"
+					Grid.ColumnSpan="2"/>
 					<Label 
                     Text= "{Binding TariffDescription.TarifEntry7.Description}"
                     IsVisible="{Binding TariffDescription.TarifEntry7.Description, Converter={StaticResource Label_Converter}}"
@@ -190,7 +312,8 @@
                     Text="{Binding TariffDescription.TarifEntry7.Value}"
                     IsVisible="{Binding TariffDescription.TarifEntry7.Value, Converter={StaticResource Label_Converter}}"
                     Grid.Row="7" 
-                    Grid.Column="1"/>
+                    Grid.Column="1"
+					Grid.ColumnSpan="2"/>
 					<Label 
                     Text= "{Binding TariffDescription.TarifEntry8.Description}"
                     IsVisible="{Binding TariffDescription.TarifEntry8.Description, Converter={StaticResource Label_Converter}}"
@@ -199,7 +322,8 @@
                     Text="{Binding TariffDescription.TarifEntry8.Value}"
                     IsVisible="{Binding TariffDescription.TarifEntry8.Value, Converter={StaticResource Label_Converter}}"
                     Grid.Row="8" 
-                    Grid.Column="1"/>
+                    Grid.Column="1"
+					Grid.ColumnSpan="2"/>
 					<Label 
                     Text= "{Binding TariffDescription.TarifEntry9.Description}"
                     IsVisible="{Binding TariffDescription.TarifEntry9.Description, Converter={StaticResource Label_Converter}}"
@@ -208,33 +332,29 @@
                     Text="{Binding TariffDescription.TarifEntry9.Value}"
                     IsVisible="{Binding TariffDescription.TarifEntry9.Value, Converter={StaticResource Label_Converter}}"
                     Grid.Row="9" 
-                    Grid.Column="1"/>
+                    Grid.Column="1"
+					Grid.ColumnSpan="2"/>
 					<!-- start tarif- entries (should be a CollectionView) -->
 					<Label 
                     Text= "{Binding TariffDescription.InfoEntry1}"
                     IsVisible="{Binding TariffDescription.InfoEntry1, Converter={StaticResource Label_Converter}}"
                     Grid.Row="10"
-                    Grid.ColumnSpan="2"/>
+                    Grid.ColumnSpan="3"/>
 					<Label 
                     Text= "{Binding TariffDescription.InfoEntry2}"
                     IsVisible="{Binding TariffDescription.InfoEntry2, Converter={StaticResource Label_Converter}}"
                     Grid.Row="11"
-                    Grid.ColumnSpan="2"/>
+                    Grid.ColumnSpan="3"/>
 					<Label 
                     Text= "{Binding TariffDescription.InfoEntry3}"
                     IsVisible="{Binding TariffDescription.InfoEntry3, Converter={StaticResource Label_Converter}}"
                     Grid.Row="12"
-                    Grid.ColumnSpan="2"/>
+                    Grid.ColumnSpan="3"/>
 					<Label 
                     Text= "{Binding TariffDescription.InfoEntry4}"
                     IsVisible="{Binding TariffDescription.InfoEntry4, Converter={StaticResource Label_Converter}}"
                     Grid.Row="13"
-                    Grid.ColumnSpan="2"/>
-					<Label 
-                    Text= "{Binding TariffDescription.TrackingInfoText}"
-                    IsVisible="{Binding TariffDescription.TrackingInfoText, Converter={StaticResource Label_Converter}}"
-                    Grid.Row="14"
-                    Grid.ColumnSpan="2"/>
+                    Grid.ColumnSpan="3"/>
 				</Grid>
 			</StackLayout>
 		</Frame>
diff --git a/Meinkonrad/TINK/View/Contact/ContactPage.xaml b/Meinkonrad/TINK/View/Contact/ContactPage.xaml
index b082967..783ea72 100644
--- a/Meinkonrad/TINK/View/Contact/ContactPage.xaml
+++ b/Meinkonrad/TINK/View/Contact/ContactPage.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
             xmlns:conv="clr-namespace:TINK.View"
             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
@@ -68,7 +68,7 @@
                     <Frame>
                         <StackLayout>
                             <Label FormattedText="{Binding LikeTinkApp}"/>
-                            <!--- Mail to app- releated support -->
+                            <!--- Mail to app- related support -->
                             <Button
                                 Text="{x:Static resources:AppResources.ActionContactMailAppReleated}"
                                 IsEnabled="{Binding IsSendMailAvailable}"
@@ -90,4 +90,4 @@
             </Frame>
         </ScrollView>
     </ContentPage.Content>
-</ContentPage>
\ No newline at end of file
+</ContentPage>
diff --git a/Meinkonrad/TINK/View/FeedbackPopup.xaml.cs b/Meinkonrad/TINK/View/FeedbackPopup.xaml.cs
index c5b1ae3..9ad4c42 100644
--- a/Meinkonrad/TINK/View/FeedbackPopup.xaml.cs
+++ b/Meinkonrad/TINK/View/FeedbackPopup.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
 using Xamarin.CommunityToolkit.UI.Views;
 using Xamarin.Forms.Xaml;
@@ -70,7 +70,7 @@ namespace TINK.View
 #endif
 		{
 			/// <summary>
-			/// Holds the current chargeing level of the battery entered by user in bars, null if unkonwn.
+			/// Holds the current charging level of the battery entered by user in bars, null if unknown.
 			/// </summary>
 			public int? CurrentChargeBars { get; set; }
 
@@ -88,4 +88,4 @@ namespace TINK.View
 			public string Message { get; set; }
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml.cs b/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml.cs
index 0efb430..75c265c 100644
--- a/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml.cs
+++ b/Meinkonrad/TINK/View/MyBikes/MyBikesPage.xaml.cs
@@ -100,7 +100,7 @@ namespace TINK.View.MyBikes
 		{
 			if (m_oViewModel == null)
 			{
-				// View model might be null (Example: Occured when page to querry for location permissions was opened)
+				// View model might be null (Example: Occured when page to query for location permissions was opened)
 				return;
 			}
 
diff --git a/Meinkonrad/TINK/View/RootFlyout/RootPage.xaml.cs b/Meinkonrad/TINK/View/RootFlyout/RootPage.xaml.cs
index 7a0ecd0..ba4cbdb 100644
--- a/Meinkonrad/TINK/View/RootFlyout/RootPage.xaml.cs
+++ b/Meinkonrad/TINK/View/RootFlyout/RootPage.xaml.cs
@@ -1,5 +1,5 @@
-using System;
-using TINK.Model.Station;
+using System;
+using TINK.Model.Stations;
 #if USEFLYOUT
 using TINK.View.MasterDetail;
 #endif
@@ -9,12 +9,12 @@ using Xamarin.Forms.Xaml;
 namespace TINK.View.Root
 {
 	/// <summary>
-	/// Mamages creation of detail pages if a flyout page menu entry is selected.
+	/// Manages creation of detail pages if a flyout page menu entry is selected.
 	/// Exposes flyout page style navigation which is used by detail pages.
 	/// </summary>
 	/// <remarks>
 	/// Examples of use cases when detail pages do navigation:
-	// - switch to map page after succesfully logging in/ logging out
+	// - switch to map page after successfully logging in/ logging out
 	// - switch to login page form bikes at station page if not yet logged in
 	/// </remarks>
 	[XamlCompilation(XamlCompilationOptions.Compile)]
@@ -29,7 +29,7 @@ namespace TINK.View.Root
 			InitializeComponent();
 			FlyoutPage.ListView.ItemSelected += OnListViewItemSelected;
 
-			// Any type of split behaviour conflics with map shifting functionality (assuming FlyoutPage behaves same like MasterDetailPage).
+			// Any type of split behavior conflics with map shifting functionality (assuming FlyoutPage behaves same like MasterDetailPage).
 			FlyoutLayoutBehavior = FlyoutLayoutBehavior.Popover;
 
 			var navigationPage = Detail as NavigationPage;
@@ -62,7 +62,7 @@ namespace TINK.View.Root
 			}
 
 			// Set selected station to new 
-			App.ModelRoot.SelectedStation = new NullStation();
+			App.ModelRoot.SelectedStation = new TINK.Model.Stations.StationNS.NullStation();
 
 			ShowPage(item.TargetType, item.Title);
 
@@ -92,4 +92,4 @@ namespace TINK.View.Root
 			Detail = new NavigationPage(page);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/TINK.sln b/TINK.sln
index c5ebbf7..1e70058 100644
--- a/TINK.sln
+++ b/TINK.sln
@@ -46,6 +46,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D5B69C6F-3413-4773-923E-21A65B21C3A3}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		.vsspell = .vsspell
 	EndProjectSection
 EndProject
 Global
diff --git a/TINK/TINK.Android/Properties/AndroidManifest.xml b/TINK/TINK.Android/Properties/AndroidManifest.xml
index ca461f2..b17954c 100644
--- a/TINK/TINK.Android/Properties/AndroidManifest.xml
+++ b/TINK/TINK.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.hauffware.sharee" android:versionName="3.0.362" android:versionCode="362">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.hauffware.sharee" android:versionName="3.0.363" android:versionCode="363">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31" />
 	<!-- Google Maps related permissions -->
 	<!-- Permission to receive remote notifications from Google Play Services -->
diff --git a/TINK/TINK.iOS/Info.plist b/TINK/TINK.iOS/Info.plist
index ee4f0ee..dd82d2a 100644
--- a/TINK/TINK.iOS/Info.plist
+++ b/TINK/TINK.iOS/Info.plist
@@ -56,8 +56,8 @@
 	<key>CFBundleDisplayName</key>
 	<string>sharee.bike</string>
 	<key>CFBundleVersion</key>
-	<string>362</string>
+	<string>363</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.362</string>
+	<string>3.0.363</string>
 </dict>
 </plist>
diff --git a/TINK/TINK/App.xaml b/TINK/TINK/App.xaml
index 0aec9a0..fe81277 100644
--- a/TINK/TINK/App.xaml
+++ b/TINK/TINK/App.xaml
@@ -32,7 +32,11 @@
 
 			<!--Info in Circle-->
 			<x:String x:Key="InfoCircle">&#xf05a;</x:String>
-			
+
+			<!--AaAbRideType-->
+			<x:String x:Key="LocationPin">&#xf3c5;</x:String>
+			<x:String x:Key="ArrowReturnBack">&#xf0e2;</x:String>
+
 			<!-- Add more resources here -->
             <ResourceDictionary.MergedDictionaries>
                 <!-- Add more resource dictionaries here -->
diff --git a/TINK/TINK/View/Bike/ILockItBike.xaml b/TINK/TINK/View/Bike/ILockItBike.xaml
index 9dce76b..da523ad 100644
--- a/TINK/TINK/View/Bike/ILockItBike.xaml
+++ b/TINK/TINK/View/Bike/ILockItBike.xaml
@@ -25,77 +25,158 @@
 					Orientation="Vertical"
 					Padding="10">
 
-					<!-- Icons, Name, ID -->
-				<Grid Padding="0,0,5,10"
+				<!-- Icons, Name, ID, ... -->
+				<Grid
+					Padding="0"
+					RowSpacing="15"
+					ColumnSpacing="5"
 					ColumnDefinitions="Auto,Auto,*"
-					RowDefinitions="Auto,Auto">
+					RowDefinitions="Auto,Auto,Auto">
 
-					<!-- Icon of the bike -->
+					<!-- Bike image -->
 					<Image
-						Grid.Column="0"
-						Grid.Row="0"
-						Grid.RowSpan="2"
-						Source="{Binding DisplayedBikeImageSourceString}"
-						HeightRequest="60"
-						Aspect="AspectFit"
-						HorizontalOptions="Start"
-						VerticalOptions="End"/>
+							Grid.Column="0"
+							Grid.Row="0"
+							Grid.RowSpan="2"
+							VerticalOptions="End"
+							Source="{Binding DisplayedBikeImageSourceString}"
+							HeightRequest="60"
+							Aspect="AspectFit"/>
 
-					<!-- Battery level -->
+					<!-- Battery level image -->
 					<sharedGui:BarLevelView
-						Grid.Column="1"
-						Grid.Row="1"
-						Current="{Binding CurrentChargeBars}"
-						Maximum="{Binding MaxChargeBars}"
-						VerticalOptions="End"
-						IsVisible="{Binding IsBatteryChargeVisible}"/>
+							Grid.Column="1"
+							Grid.Row="0"
+							Grid.RowSpan="2"
+							VerticalOptions="End"
+							Current="{Binding CurrentChargeBars}"
+							Maximum="{Binding MaxChargeBars}"
+							IsVisible="{Binding IsBatteryChargeVisible}"/>
 
-					<!-- Name of the bike -->
-					<Label
+					<!-- Rental state and error -->
+					<StackLayout
+						Grid.Column="0"
+						Grid.ColumnSpan="2"
+						Grid.Row="2"
+						Spacing="0"
+						Orientation="Vertical"
+						HorizontalOptions="Start"
+						VerticalOptions="End">
+
+						<!-- Rental state -->
+						<Label
+							Text="{Binding StateText}"
+							FontSize="Small"
+							TextColor="{Binding StateColor}"/>
+						
+						<!-- Rental state error info -->
+						<Label
+							Text="{Binding ErrorText}"
+							FontSize="Small"
+							IsVisible="{Binding ErrorText, Converter={StaticResource Label_Converter}}"
+							TextColor="Red"/>
+
+					</StackLayout>
+
+					<!-- Name and Id of the bike -->
+					<StackLayout
 						Grid.Column="1"
 						Grid.ColumnSpan="2"
 						Grid.Row="0"
-						FontAttributes="Bold"
-						FontSize="Large"
-						HorizontalTextAlignment="Right"
-						Text="{Binding Name}"/>
+						Orientation="Vertical"
+						VerticalOptions="Start"
+						HorizontalOptions="End"
+						Spacing="0">
+						
+						<!-- Name -->
+						<Label
+							FontAttributes="Bold"
+							FontSize="Large"
+							TextColor="Black"
+							HorizontalTextAlignment="Right"
+							Text="{Binding Name}"/>
 
-					<!-- Id of the bike -->
-					<Label
+						<!-- Id -->
+						<Label
+							TextColor="DimGray"
+							FontAttributes="Bold"
+							HorizontalTextAlignment="Right"
+							IsVisible="{Binding DisplayId, Converter={StaticResource Label_Converter}}"
+							Text="{Binding DisplayId}"/>
+
+					</StackLayout>
+
+					<!-- AaAbRideType -->
+					<StackLayout
 						Grid.Column="2"
 						Grid.Row="1"
-						FontAttributes="Bold"
-						HorizontalTextAlignment="Right"
-						IsVisible="{Binding DisplayId, Converter={StaticResource Label_Converter}}"
-						Text="{Binding DisplayId}"/>
+						Grid.RowSpan="2"
+						Spacing="0"
+						HorizontalOptions="End"
+						VerticalOptions="End"
+						IsVisible="{Binding AaRideType}">
+						<StackLayout
+							Orientation="Horizontal"
+							HorizontalOptions="End">
+							<Image>
+								<Image.Source>
+									<FontImageSource
+									Glyph="{StaticResource LocationPin}"
+									Color="Black"
+									FontFamily="FA-S"
+									Size="20"/>
+								</Image.Source>
+							</Image>
+							<Image>
+								<Image.Source>
+									<FontImageSource
+									Glyph="{StaticResource ArrowReturnBack}"
+									Color="Black"
+									FontFamily="FA-S"
+									Size="20"/>
+								</Image.Source>
+							</Image>
+							<Button
+								Command="{Binding ShowRideTypeInfoCommand}"
+								WidthRequest="24"
+								HeightRequest="24"
+								BackgroundColor="Transparent"
+								BorderWidth="0"
+								Padding="0"
+								Margin="5,0,0,0">
+								<Button.ImageSource>
+									<FontImageSource
+									Glyph="{StaticResource InfoCircle}"
+									Color="DimGray"
+									FontFamily="FA-S"
+									Size="20"/>
+								</Button.ImageSource>
+							</Button>
+						</StackLayout>
+						<Label 
+								Text= "{Binding StationId}"
+								FontSize="Small"
+								HorizontalOptions="End"/>
+					</StackLayout>
 
 				</Grid>
 
-					<!-- Rental state -->
-					<Label 
-						Text="{Binding StateText}"
-						TextColor="{Binding StateColor}"/>
-					<Label 
-						Text="{Binding ErrorText}"
-						IsVisible="{Binding ErrorText, Converter={StaticResource Label_Converter}}"
-						TextColor="Red"/>
+				<!-- Buttons -->
+				<Button 
+					Text="{Binding ButtonText}"
+					IsVisible="{Binding IsButtonVisible}"
+					Command="{Binding OnButtonClicked}"/>
+				<Button
+					Style="{StaticResource SecondaryButton}"
+					Text="{Binding LockitButtonText}"
+					IsVisible="{Binding IsLockitButtonVisible}"
+					Command="{Binding OnLockitButtonClicked}"/>
 
-					<!-- Buttons -->
-					<Button 
-						Text="{Binding ButtonText}"
-						IsVisible="{Binding IsButtonVisible}"
-						Command="{Binding OnButtonClicked}"/>
-					<Button
-						Style="{StaticResource SecondaryButton}"
-						Text="{Binding LockitButtonText}"
-						IsVisible="{Binding IsLockitButtonVisible}"
-						Command="{Binding OnLockitButtonClicked}"/>
-
-			<!-- Rental description (tarif name, options and rental info -->
-            <Grid
-                RowSpacing="0" 
-                IsVisible="{Binding TariffDescription.Header, Converter={StaticResource Label_Converter}}">
-						<Grid.RowDefinitions>
+				<!-- Rental description (tarif name, options and rental info -->
+				<Grid
+					RowSpacing="0" 
+					IsVisible="{Binding TariffDescription.Header, Converter={StaticResource Label_Converter}}">
+					<Grid.RowDefinitions>
 							<!-- start tarif- entries -->
 							<RowDefinition Height="Auto" />
 							<RowDefinition Height="Auto" />
@@ -113,59 +194,58 @@
 							<RowDefinition Height="Auto" />
 							<RowDefinition Height="Auto" />
 							<RowDefinition Height="Auto" />
-						</Grid.RowDefinitions>
+					</Grid.RowDefinitions>
 
-						<Grid.ColumnDefinitions>
+					<Grid.ColumnDefinitions>
 							<ColumnDefinition Width="Auto" />
 							<ColumnDefinition Width="*" />
 							<ColumnDefinition Width="Auto" />
-						</Grid.ColumnDefinitions>
+					</Grid.ColumnDefinitions>
 
-						<!-- start tarif- entries (should be a CollectionView) -->
-						<Label 
-                    Text= "{x:Static resources:AppResources.MessageBikesManagementTariffDescriptionTariffHeader}"
-                    IsVisible="{Binding TariffDescription.Header, Converter={StaticResource Label_Converter}}"
-                    Grid.Row="0" 
-                    FontAttributes="Bold"/>
-						<Label 
-                    Text="{Binding TariffDescription.Header}"
-                    IsVisible="{Binding TariffDescription.Header, Converter={StaticResource Label_Converter}}"
-                    Grid.Row="0" 
-                    Grid.Column="1"
-                    FontAttributes="Bold"/>
-
-						<!--Tracking-->
-						<Grid
-					Grid.Row="0"
-					Grid.Column="1"
-					Grid.ColumnSpan="2"
-					ColumnDefinitions="*,Auto"
-					IsVisible="{Binding TariffDescription.TrackingInfoText, Converter={StaticResource Label_Converter}}">
-							<Label 
-						Text= "Tracking"
-						FontAttributes="Bold"
-						Grid.Column="0"
-						HorizontalOptions="End"/>
-							<Button
-						Command="{Binding ShowTrackingInfoCommand}"
-						WidthRequest="24"
-						HeightRequest="24"
-						BackgroundColor="Transparent"
-						BorderWidth="0"
+					<!-- start tarif- entries (should be a CollectionView) -->
+					<Label 
+						Text= "{x:Static resources:AppResources.MessageBikesManagementTariffDescriptionTariffHeader}"
+						IsVisible="{Binding TariffDescription.Header, Converter={StaticResource Label_Converter}}"
+						Grid.Row="0" 
+						FontAttributes="Bold"/>
+					<Label 
+						Text="{Binding TariffDescription.Header}"
+						IsVisible="{Binding TariffDescription.Header, Converter={StaticResource Label_Converter}}"
+						Grid.Row="0" 
 						Grid.Column="1"
-						Padding="0"
-						Margin="0">
-								<Button.ImageSource>
-									<FontImageSource
-								Glyph="{StaticResource InfoCircle}"
-								Color="DimGray"
-								FontFamily="FA-S"
-								Size="20"/>
-								</Button.ImageSource>
-							</Button>
-						</Grid>
+						FontAttributes="Bold"/>
 
+					<!--Tracking-->
+					<Grid
+						Grid.Row="0"
+						Grid.Column="1"
+						Grid.ColumnSpan="2"
+						ColumnDefinitions="*,Auto"
+						IsVisible="{Binding TariffDescription.TrackingInfoText, Converter={StaticResource Label_Converter}}">
 						<Label 
+							Text= "Tracking"
+							Grid.Column="0"
+							HorizontalOptions="End"/>
+						<Button
+							Command="{Binding ShowTrackingInfoCommand}"
+							WidthRequest="24"
+							HeightRequest="24"
+							BackgroundColor="Transparent"
+							BorderWidth="0"
+							Grid.Column="1"
+							Padding="0"
+							Margin="0">
+							<Button.ImageSource>
+								<FontImageSource
+									Glyph="{StaticResource InfoCircle}"
+									Color="DimGray"
+									FontFamily="FA-S"
+									Size="20"/>
+							</Button.ImageSource>
+						</Button>
+					</Grid>
+
+					<Label 
                     Text= "{Binding TariffDescription.TarifEntry1.Description}"
                     IsVisible="{Binding TariffDescription.TarifEntry1.Description, Converter={StaticResource Label_Converter}}"
                     Grid.Row="1"/>
diff --git a/TINK/TINK/View/Contact/ContactPage.xaml b/TINK/TINK/View/Contact/ContactPage.xaml
index 78237ef..a5a0036 100644
--- a/TINK/TINK/View/Contact/ContactPage.xaml
+++ b/TINK/TINK/View/Contact/ContactPage.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
             xmlns:conv="clr-namespace:TINK.View"
             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
@@ -67,7 +67,7 @@
                     <Frame>
                         <StackLayout>
                             <Label FormattedText="{Binding LikeTinkApp}"/>
-                            <!--- Mail to app- releated support -->
+                            <!--- Mail to app- related support -->
                             <Button
                                 Text="{x:Static resources:AppResources.ActionContactMailAppReleated}"
                                 IsEnabled="{Binding IsSendMailAvailable}"
@@ -89,4 +89,4 @@
             </Frame>
         </ScrollView>
     </ContentPage.Content>
-</ContentPage>
\ No newline at end of file
+</ContentPage>
diff --git a/TINK/TINK/View/FeedbackPopup.xaml.cs b/TINK/TINK/View/FeedbackPopup.xaml.cs
index 2c73611..bd1b32f 100644
--- a/TINK/TINK/View/FeedbackPopup.xaml.cs
+++ b/TINK/TINK/View/FeedbackPopup.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
 using Xamarin.CommunityToolkit.UI.Views;
 using Xamarin.Forms.Xaml;
@@ -69,7 +69,7 @@ namespace TINK.View
 #endif
 		{
 			/// <summary>
-			/// Holds the current chargeing level of the battery entered by user in bars, null if unkonwn.
+			/// Holds the current charging level of the battery entered by user in bars, null if unknown.
 			/// </summary>
 			public int? CurrentChargeBars { get; set; }
 
@@ -87,4 +87,4 @@ namespace TINK.View
 			public string Message { get; set; }
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/TINK/TINK/View/MyBikes/MyBikesPage.xaml.cs b/TINK/TINK/View/MyBikes/MyBikesPage.xaml.cs
index 0efb430..75c265c 100644
--- a/TINK/TINK/View/MyBikes/MyBikesPage.xaml.cs
+++ b/TINK/TINK/View/MyBikes/MyBikesPage.xaml.cs
@@ -100,7 +100,7 @@ namespace TINK.View.MyBikes
 		{
 			if (m_oViewModel == null)
 			{
-				// View model might be null (Example: Occured when page to querry for location permissions was opened)
+				// View model might be null (Example: Occured when page to query for location permissions was opened)
 				return;
 			}
 
diff --git a/TINK/TINK/View/RootFlyout/RootPage.xaml.cs b/TINK/TINK/View/RootFlyout/RootPage.xaml.cs
index 7a0ecd0..ba4cbdb 100644
--- a/TINK/TINK/View/RootFlyout/RootPage.xaml.cs
+++ b/TINK/TINK/View/RootFlyout/RootPage.xaml.cs
@@ -1,5 +1,5 @@
-using System;
-using TINK.Model.Station;
+using System;
+using TINK.Model.Stations;
 #if USEFLYOUT
 using TINK.View.MasterDetail;
 #endif
@@ -9,12 +9,12 @@ using Xamarin.Forms.Xaml;
 namespace TINK.View.Root
 {
 	/// <summary>
-	/// Mamages creation of detail pages if a flyout page menu entry is selected.
+	/// Manages creation of detail pages if a flyout page menu entry is selected.
 	/// Exposes flyout page style navigation which is used by detail pages.
 	/// </summary>
 	/// <remarks>
 	/// Examples of use cases when detail pages do navigation:
-	// - switch to map page after succesfully logging in/ logging out
+	// - switch to map page after successfully logging in/ logging out
 	// - switch to login page form bikes at station page if not yet logged in
 	/// </remarks>
 	[XamlCompilation(XamlCompilationOptions.Compile)]
@@ -29,7 +29,7 @@ namespace TINK.View.Root
 			InitializeComponent();
 			FlyoutPage.ListView.ItemSelected += OnListViewItemSelected;
 
-			// Any type of split behaviour conflics with map shifting functionality (assuming FlyoutPage behaves same like MasterDetailPage).
+			// Any type of split behavior conflics with map shifting functionality (assuming FlyoutPage behaves same like MasterDetailPage).
 			FlyoutLayoutBehavior = FlyoutLayoutBehavior.Popover;
 
 			var navigationPage = Detail as NavigationPage;
@@ -62,7 +62,7 @@ namespace TINK.View.Root
 			}
 
 			// Set selected station to new 
-			App.ModelRoot.SelectedStation = new NullStation();
+			App.ModelRoot.SelectedStation = new TINK.Model.Stations.StationNS.NullStation();
 
 			ShowPage(item.TargetType, item.Title);
 
@@ -92,4 +92,4 @@ namespace TINK.View.Root
 			Detail = new NavigationPage(page);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/TINKLib/Model/Bikes/BikeCollectionMutable.cs b/TINKLib/Model/Bikes/BikeCollectionMutable.cs
index 58279e3..8561dd1 100644
--- a/TINKLib/Model/Bikes/BikeCollectionMutable.cs
+++ b/TINKLib/Model/Bikes/BikeCollectionMutable.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using Serilog;
-using TINK.Model.Station;
+using TINK.Model.Stations.StationNS;
 using BikeInfo = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo;
 using BikeInfoMutable = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable;
 
@@ -25,7 +25,7 @@ namespace TINK.Model.Bikes
 		/// </summary>
 		/// <param name="bikesAll"> Object holding bikes info from copri to update from. Holds station id but not station name.</param>
 		/// <param name="stations"> All stations to get station names from.</param>
-		/// <param name="p_oDateTimeProvider">Provices date time information.</param>
+		/// <param name="p_oDateTimeProvider">Provides date time information.</param>
 		public void Update(
 			IEnumerable<BikeInfo> bikesAll,
 			IEnumerable<IStation> stations)
@@ -74,18 +74,18 @@ namespace TINK.Model.Bikes
 		}
 
 		/// <summary>
-		/// Adds a new bike to collecion of bike.
+		/// Adds a new bike to collection of bike.
 		/// </summary>
 		/// <param name="newBike">New bike to add.</param>
 		/// <exception cref="Exception">Thrown if bike is not unique.</exception>
 		public new void Add(BikeInfoMutable newBike)
 		{
-			// Ensure that bike id of new bike is is unique
+			// Ensure that bike id of new bike is unique
 			foreach (BikeInfoMutable bike in Items)
 			{
 				if (bike.Id == newBike.Id)
 				{
-					throw new Exception(string.Format("Can not add bike with {0} to collection ob bike. Id is not unnique.", newBike));
+					throw new Exception(string.Format("Can not add bike with {0} to collection ob bike. Id is not unique.", newBike));
 				}
 			}
 
@@ -93,7 +93,7 @@ namespace TINK.Model.Bikes
 		}
 
 		/// <summary>
-		/// Bike selected by user for regerving or cancel reservation.
+		/// Bike selected by user for reserving or cancel reservation.
 		/// </summary>
 		public BikeInfoMutable SelectedBike
 		{
@@ -115,7 +115,7 @@ namespace TINK.Model.Bikes
 			=> this.FirstOrDefault(bike => bike.Id == id);
 
 		/// <summary>
-		/// Deteermines whether a bike by given key exists.
+		/// Determines whether a bike by given key exists.
 		/// </summary>
 		/// <param name="p_strKey">Key to check.</param>
 		/// <returns>True if bike exists.</returns>
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/BC/BikeInfo.cs b/TINKLib/Model/Bikes/BikeInfoNS/BC/BikeInfo.cs
index 7588b25..1a2fe18 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/BC/BikeInfo.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/BC/BikeInfo.cs
@@ -6,7 +6,7 @@ using TINK.Model.State;
 
 namespace TINK.Model.Bikes.BikeInfoNS.BC
 {
-	public class BikeInfo : IBikeInfo
+	public abstract class BikeInfo : IBikeInfo
 	{
 		/// <summary> Default value of demo property. </summary>
 		public const bool DEFAULTVALUEISDEMO = false;
@@ -64,72 +64,6 @@ namespace TINK.Model.Bikes.BikeInfoNS.BC
 			bikeInfo.TariffDescription)
 		{ }
 
-		/// <summary>
-		/// Constructs a bike info object for a available bike.
-		/// </summary>
-		/// <param name="dataSource">Specified the source of the data.</param>
-		/// <param name="stationId">Id of station where bike is located.</param>
-		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-		/// <param name="tariffDescription">Hold tariff description of bike.</param>
-		public BikeInfo(
-			Bike bike,
-			Drive drive,
-			DataSource dataSource,
-			string stationId,
-			Uri operatorUri = null,
-			RentalDescription tariffDescription = null,
-			bool? isDemo = DEFAULTVALUEISDEMO,
-			IEnumerable<string> group = null) : this(
-				new StateInfo(),
-				bike,
-				drive,
-				dataSource,
-				isDemo,
-				group,
-				stationId,
-				operatorUri,
-				tariffDescription)
-		{
-		}
-
-		/// <summary>
-		/// Constructs a bike info object for a booked bike.
-		/// </summary>
-		/// <param name="dataSource">Specified the source of the data.</param>
-		/// <param name="dateTimeProvider">Provider for current date time to calculate remainig time on demand for state of type reserved.</param>
-		/// <param name="currentStationId">Name of station where bike is located, null if bike is on the road.</param>
-		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
-		/// <param name="tariffDescription">Hold tariff description of bike.</param>
-		/// <param name="bookedAt">Date time when bike was booked</param>
-		/// <param name="mailAddress">Mail address of user which booked bike.</param>
-		/// <param name="code">Booking code.</param>
-		public BikeInfo(
-			Bike bike,
-			Drive drive,
-			DataSource dataSource,
-			bool? isDemo,
-			IEnumerable<string> group,
-			string currentStationId,
-			Uri operatorUri,
-			RentalDescription tariffDescription,
-			DateTime bookedAt,
-			string mailAddress,
-			string code) : this(
-				new StateInfo(
-					bookedAt,
-					mailAddress,
-					code),
-				bike,
-				drive,
-				dataSource,
-				isDemo,
-				group,
-				currentStationId,
-				operatorUri,
-				tariffDescription)
-		{
-		}
-
 		/// <summary> True if device is demo device, false otherwise. </summary>
 		public bool IsDemo { get; }
 
@@ -141,7 +75,7 @@ namespace TINK.Model.Bikes.BikeInfoNS.BC
 		/// </summary>
 		public string StationId { get; }
 
-		/// <summary> Holds description about the tarif. </summary>
+		/// <summary> Holds description about the tariff. </summary>
 		public RentalDescription TariffDescription { get; }
 
 		/// Holds the rent state of the bike.
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/BC/BikeInfoMutable.cs b/TINKLib/Model/Bikes/BikeInfoNS/BC/BikeInfoMutable.cs
index f9231a1..5a5be8b 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/BC/BikeInfoMutable.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/BC/BikeInfoMutable.cs
@@ -9,7 +9,7 @@ using TINK.Model.State;
 namespace TINK.Model.Bikes.BikeInfoNS.BC
 {
 	[DataContract]
-	public class BikeInfoMutable : IBikeInfoMutable, INotifyPropertyChanged
+	public abstract class BikeInfoMutable : IBikeInfoMutable, INotifyPropertyChanged
 	{
 		/// <summary> Holds the bike. </summary>
 		private readonly Bike _Bike;
@@ -24,7 +24,7 @@ namespace TINK.Model.Bikes.BikeInfoNS.BC
 		/// Constructs a bike.
 		/// </summary>
 		/// <param name="isDemo">True if device is demo device, false otherwise.</param>
-		/// <param name="dateTimeProvider">Provider for current date time to calculate remainig time on demand for state of type reserved.</param>
+		/// <param name="dateTimeProvider">Provider for current date time to calculate remaining time on demand for state of type reserved.</param>
 		/// <param name="stationId">Name of station where bike is located, null if bike is on the road.</param>
 		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
 		/// <param name="tariffDescription">Hold tariff description of bike.</param>
@@ -55,24 +55,6 @@ namespace TINK.Model.Bikes.BikeInfoNS.BC
 			TariffDescription = tariffDescription;
 		}
 
-		/// <summary> Constructs a bike object from source. </summary>
-		public BikeInfoMutable(IBikeInfo bike, string stationName) : this(
-			bike != null
-				? bike.Bike
-				: throw new ArgumentNullException(nameof(bike)),
-			bike.Drive,
-			bike.DataSource,	
-			bike.IsDemo,
-			bike.Group,
-			bike.StationId,
-			stationName,
-			bike.OperatorUri,
-			bike.TariffDescription,
-			null /* date time provider */,
-			bike.State)
-		{
-		}
-
 		/// <summary> Id of station a which bike is located, null otherwise.</summary>
 		[DataMember]
 		public string StationId { get; }
@@ -81,7 +63,7 @@ namespace TINK.Model.Bikes.BikeInfoNS.BC
 		[DataMember]
 		public string StationName { get; }
 
-		/// <summary> Holds description about the tarif. </summary>
+		/// <summary> Holds description about the tariff. </summary>
 		[DataMember]
 		public RentalDescription TariffDescription { get; private set; }
 
@@ -113,6 +95,12 @@ namespace TINK.Model.Bikes.BikeInfoNS.BC
 
 		public TypeOfBike? TypeOfBike => _Bike.TypeOfBike;
 
+		/// <summary>
+		/// Gets whether bike is a AA bike (bike must be always returned a the same station) or AB bike (start and end stations can be different stations).
+		/// </summary>
+		public AaRideType? AaRideType => _Bike.AaRideType;
+
+
 		public LockModel LockModel => _Bike.LockModel;
 
 		public string Description => _Bike.Description;
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/BC/IBikeInfoMutable.cs b/TINKLib/Model/Bikes/BikeInfoNS/BC/IBikeInfoMutable.cs
index 4d59cc9..982e25b 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/BC/IBikeInfoMutable.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/BC/IBikeInfoMutable.cs
@@ -30,6 +30,11 @@ namespace TINK.Model.Bikes.BikeInfoNS.BC
 		/// </summary>
 		TypeOfBike? TypeOfBike { get; }
 
+		/// <summary>
+		/// Gets whether bike is a AA bike (bike must be always returned a the same station) or AB bike (start and end stations can be different stations).
+		/// </summary>
+		AaRideType? AaRideType { get; }
+
 		/// <summary> Gets the model of the lock. </summary>
 		LockModel LockModel { get; }
 
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/BikeNS/Bike.cs b/TINKLib/Model/Bikes/BikeInfoNS/BikeNS/Bike.cs
index fa3ca78..c7df9d4 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/BikeNS/Bike.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/BikeNS/Bike.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace TINK.Model.Bikes.BikeInfoNS.BikeNS
@@ -21,12 +21,19 @@ namespace TINK.Model.Bikes.BikeInfoNS.BikeNS
 		City = 2,
 	}
 
+	/// <summary> Holds whether bike is a AA bike (bike must be always returned a the same station) or AB bike (start and end stations can be different stations).</summary>
+	public enum AaRideType
+	{
+		NoAaRide = 0,
+		AaRide = 1,
+	}
+
 	/// <summary> Holds the model of lock. </summary>
 	public enum LockModel
 	{
 		ILockIt,        // haveltec GbmH Brandenburg, Germany bluetooth lock     
-		BordComputer,   // Teilrad BC
-		Sigo,           // Sigo Gmbh Darmstadt, Germany bike lock
+		BordComputer,   // TeilRad BC
+		Sigo,           // Sigo GmbH Darmstadt, Germany bike lock
 	}
 
 	/// <summary> Holds the type of lock. </summary>
@@ -47,10 +54,12 @@ namespace TINK.Model.Bikes.BikeInfoNS.BikeNS
 			LockModel lockModel,
 			WheelType? wheelType = null,
 			TypeOfBike? typeOfBike = null,
+			AaRideType? aaRideType = null,
 			string description = null)
 		{
 			WheelType = wheelType;
 			TypeOfBike = typeOfBike;
+			AaRideType = aaRideType;
 			LockModel = lockModel;
 			Id = id;
 			Description = description;
@@ -71,6 +80,11 @@ namespace TINK.Model.Bikes.BikeInfoNS.BikeNS
 		/// </summary>
 		public TypeOfBike? TypeOfBike { get; }
 
+		/// <summary>
+		/// Gets whether bike is a AA bike (bike must be always returned a the same station) or AB bike (start and end stations can be different stations).
+		/// </summary>
+		public AaRideType? AaRideType { get; }
+
 		/// <summary> Gets the model of the lock. </summary>
 		public LockModel LockModel { get; private set; }
 
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/BikeInfo.cs b/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/BikeInfo.cs
index 0263b8b..db81549 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/BikeInfo.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/BluetoothLock/BikeInfo.cs
@@ -33,9 +33,10 @@ namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 				bike != null
 					? new Bike(
 						bike.Id,
-						LockModel.ILockIt /* Ensure consistend lock model value */,
+						LockModel.ILockIt /* Ensure consistent lock model value */,
 						bike.WheelType,
 						bike.TypeOfBike,
+						bike.AaRideType,
 						bike.Description)
 					: throw new ArgumentNullException(nameof(bike)),
 				drive,
@@ -53,7 +54,7 @@ namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 		/// Constructs a bike info object for a requested bike.
 		/// </summary>
 		/// <param name="dataSource">Specified the source of the data.</param>
-		/// <param name="dateTimeProvider">Provider for current date time to calculate remainig time on demand for state of type reserved.</param>
+		/// <param name="dateTimeProvider">Provider for current date time to calculate remaining time on demand for state of type reserved.</param>
 		/// <param name="lockId">Id of the lock.</param>
 		/// <param name="lockGuid">GUID specifying the lock.</param>
 		/// <param name="requestedAt">Date time when bike was requested</param>
@@ -61,7 +62,7 @@ namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 		/// <param name="currentStationId">Name of station where bike is located, null if bike is on the road.</param>
 		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
 		/// <param name="tariffDescription">Hold tariff description of bike.</param>
-		/// <param name="dateTimeProvider">Date time provider to calculate reaining time.</param>
+		/// <param name="dateTimeProvider">Date time provider to calculate remaining time.</param>
 		public BikeInfo(
 			Bike bike,
 			Drive drive,
@@ -87,9 +88,10 @@ namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 				bike != null
 					? new Bike(
 						bike.Id,
-						LockModel.ILockIt /* Ensure consistend lock model value */,
+						LockModel.ILockIt /* Ensure consistent lock model value */,
 						bike.WheelType,
 						bike.TypeOfBike,
+						bike.AaRideType,
 						bike.Description)
 					: throw new ArgumentNullException(nameof(bike)),
 				drive,
@@ -139,9 +141,10 @@ namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 				bike != null
 					? new Bike(
 						bike.Id,
-						LockModel.ILockIt /* Ensure consistend lock model value */,
+						LockModel.ILockIt /* Ensure consistent lock model value */,
 						bike.WheelType,
 						bike.TypeOfBike,
+						bike.AaRideType,
 						bike.Description)
 					: throw new ArgumentNullException(),
 				drive,
@@ -155,7 +158,7 @@ namespace TINK.Model.Bikes.BikeInfoNS.BluetoothLock
 			LockInfo = new LockInfo.Builder { Id = lockId, Guid = lockGuid, UserKey = userKey, AdminKey = adminKey, Seed = seed }.Build();
 		}
 
-		public BikeInfo(Model.Bikes.BikeInfoNS.BC.BikeInfo bikeInfo, LockInfo lockInfo) : base(
+		public BikeInfo(BC.BikeInfo bikeInfo, LockInfo lockInfo) : base(
 			bikeInfo ?? throw new ArgumentException($"Can not copy-construct {typeof(BikeInfo).Name}-object. Source bike info must not be null."))
 		{
 			LockInfo = lockInfo
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/BikeInfo.cs b/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/BikeInfo.cs
index 5c12bb3..1092939 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/BikeInfo.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/BikeInfo.cs
@@ -38,8 +38,9 @@ namespace TINK.Model.Bikes.BikeInfoNS.CopriLock
 					? new Bike(
 						bike.Id,
 						LockModel.Sigo,
-						bike.WheelType /* Ensure consistend lock model value */,
+						bike.WheelType /* Ensure consistent lock model value */,
 						bike.TypeOfBike,
+						bike.AaRideType,
 						bike.Description)
 					: throw new ArgumentNullException(nameof(bike)),
 				drive,
@@ -66,7 +67,7 @@ namespace TINK.Model.Bikes.BikeInfoNS.CopriLock
 		/// <param name="lockInfo">Lock info.</param>
 		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
 		/// <param name="tariffDescription">Hold tariff description of bike.</param>
-		/// <param name="dateTimeProvider">Provider for current date time to calculate remainig time on demand for state of type reserved.</param>
+		/// <param name="dateTimeProvider">Provider for current date time to calculate remaining time on demand for state of type reserved.</param>
 		public BikeInfo(
 			Bike bike,
 			Drive drive,
@@ -88,9 +89,10 @@ namespace TINK.Model.Bikes.BikeInfoNS.CopriLock
 				bike != null
 					? new Bike(
 						bike.Id,
-						LockModel.Sigo /* Ensure consistend lock model value */,
+						LockModel.Sigo /* Ensure consistent lock model value */,
 						bike.WheelType,
 						bike.TypeOfBike,
+						bike.AaRideType,
 						bike.Description)
 					: throw new ArgumentNullException(nameof(bike)),
 				drive,
@@ -136,9 +138,10 @@ namespace TINK.Model.Bikes.BikeInfoNS.CopriLock
 				bike != null
 					? new Bike(
 						bike.Id,
-						LockModel.Sigo /* Ensure consistend lock model value */,
+						LockModel.Sigo /* Ensure consistent lock model value */,
 						bike.WheelType,
 						bike.TypeOfBike,
+						bike.AaRideType,
 						bike.Description)
 					: throw new ArgumentNullException(nameof(bike)),
 				drive,
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/BikeInfoMutable.cs b/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/BikeInfoMutable.cs
index 6d813bb..9896b3a 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/BikeInfoMutable.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/CopriLock/BikeInfoMutable.cs
@@ -35,7 +35,7 @@ namespace TINK.Model.Bikes.BikeInfoNS.CopriLock
 				return;
 			}
 
-			// Add a dummy querry. Querries are not yet read from COPRI but compiled into the app.
+			// Add a dummy query. Querries are not yet read from COPRI but compiled into the app.
 			BookingFinishedModel.MiniSurvey.Questions.Add("q1", new MiniSurvey.QuestionModel());
 		}
 
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/BatteryNS/Battery.cs b/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/BatteryNS/Battery.cs
index dc8da99..0734581 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/BatteryNS/Battery.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/BatteryNS/Battery.cs
@@ -1,4 +1,4 @@
-using Serilog;
+using Serilog;
 
 namespace TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS
 {
@@ -12,12 +12,12 @@ namespace TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS
 		public double CurrentChargePercent { get; private set; } = double.NaN;
 
 		/// <summary>
-		/// Holds the current chargeing level of the battery in bars, null if unkonwn.
+		/// Holds the current charging level of the battery in bars, null if unknown.
 		/// </summary>
 		public int? CurrentChargeBars { get; private set; } = null;
 
 		/// <summary>
-		/// Holds the maximum chargeing level of the battery in bars, null if unkonwn.
+		/// Holds the maximum charging level of the battery in bars, null if unknown.
 		/// </summary>
 		public int? MaxChargeBars { get; private set; } = null;
 
@@ -34,12 +34,12 @@ namespace TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS
 		public class Builder
 		{
 			/// <summary>
-			/// Holds the current chargeing level of the battery in bars.
+			/// Holds the current charging level of the battery in bars.
 			/// </summary>
 			public int? CurrentChargeBars { get; set; } = null;
 
 			/// <summary>
-			/// Holds the maximum chargeing level of the battery in bars.
+			/// Holds the maximum charging level of the battery in bars.
 			/// </summary>
 			public int? MaxChargeBars { get; set; } = null;
 
@@ -83,7 +83,7 @@ namespace TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS
 					&& MaxChargeBars == null)
 				{
 					// If current charge bars is set, max charge must be set as well.
-					Log.ForContext<Battery>().Error($"Current bars value can not be set to {CurrentChargeBars} if max bars is not se.");
+					Log.ForContext<Battery>().Error($"Current bars value can not be set to {CurrentChargeBars} if max bars is not set.");
 					CurrentChargeBars = null;
 				}
 
@@ -92,7 +92,7 @@ namespace TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS
 					&& CurrentChargeBars > MaxChargeBars)
 				{
 					// If current charge bars must never be larger than max charge bars.
-					Log.ForContext<Battery>().Error($"Invalid current bars value {CurrentChargeBars} detected. Value must never be largen than max value bars {MaxChargeBars}.");
+					Log.ForContext<Battery>().Error($"Invalid current bars value {CurrentChargeBars} detected. Value must never be larger than max value bars {MaxChargeBars}.");
 					CurrentChargeBars = null;
 				}
 
diff --git a/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/BatteryNS/IBattery.cs b/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/BatteryNS/IBattery.cs
index 63a62cd..1ee330d 100644
--- a/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/BatteryNS/IBattery.cs
+++ b/TINKLib/Model/Bikes/BikeInfoNS/DriveNS/BatteryNS/IBattery.cs
@@ -1,4 +1,4 @@
-
+
 namespace TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS
 {
 	public interface IBattery
@@ -9,12 +9,12 @@ namespace TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS
 		double CurrentChargePercent { get; }
 
 		/// <summary>
-		/// Holds the current chargeing level of the battery in bars. Must not be arger than MaxChargeBars, null if unkonwn.
+		/// Holds the current charging level of the battery in bars. Must not be larger than MaxChargeBars, null if unknown.
 		/// </summary>
 		int? CurrentChargeBars { get; }
 
 		/// <summary>
-		/// Holds the maximum chargeing level of the battery in bars, null if unkonwn.
+		/// Holds the maximum charging level of the battery in bars, null if unknown.
 		/// </summary>
 		int? MaxChargeBars { get; }
 
diff --git a/TINKLib/Model/Bikes/IBikeCollection.cs b/TINKLib/Model/Bikes/IBikeCollection.cs
index f8cf387..910e592 100644
--- a/TINKLib/Model/Bikes/IBikeCollection.cs
+++ b/TINKLib/Model/Bikes/IBikeCollection.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace TINK.Model.Bikes
 {
@@ -12,7 +12,7 @@ namespace TINK.Model.Bikes
 		T GetById(string id);
 
 		/// <summary>
-		/// Deteermines whether a bike by given key exists.
+		/// Determines whether a bike by given key exists.
 		/// </summary>
 		/// <param name="p_strKey">Key to check.</param>
 		/// <returns>True if bike exists.</returns>
@@ -27,7 +27,7 @@ namespace TINK.Model.Bikes
 		void RemoveById(string id);
 
 		/// <summary>
-		/// Adds a new element to dictinary.
+		/// Adds a new element to dictionary.
 		/// </summary>
 		/// <param name="newElement">New element to add.</param>
 		void Add(T newElement);
diff --git a/TINKLib/Model/Connector/Command/ICommand.cs b/TINKLib/Model/Connector/Command/ICommand.cs
index 8098e7d..760f11a 100644
--- a/TINKLib/Model/Connector/Command/ICommand.cs
+++ b/TINKLib/Model/Connector/Command/ICommand.cs
@@ -129,7 +129,7 @@ namespace TINK.Model.Connector
 		string BikeId { get; }
 
 		/// <summary>
-		/// Holds the current chargeing level of the battery in bars, null if unkonwn.
+		/// Holds the current charging level of the battery in bars, null if unknown.
 		/// </summary>
 		int? CurrentChargeBars { get; set; }
 
diff --git a/TINKLib/Model/Connector/Command/UserFeedbackDto.cs b/TINKLib/Model/Connector/Command/UserFeedbackDto.cs
index 0b28c78..abf9712 100644
--- a/TINKLib/Model/Connector/Command/UserFeedbackDto.cs
+++ b/TINKLib/Model/Connector/Command/UserFeedbackDto.cs
@@ -1,4 +1,4 @@
-
+
 namespace TINK.Model.Connector
 {
 #if USCSHARP9
@@ -18,7 +18,7 @@ namespace TINK.Model.Connector
 		public string BikeId { get; set; }
 
 		/// <summary>
-		/// Holds the current chargeing level of the battery in bars, null if unkonwn.
+		/// Holds the current charging level of the battery in bars, null if unknown.
 		/// </summary>
 		public int? CurrentChargeBars { get; set; }
 
diff --git a/TINKLib/Model/Connector/FilteredConnector.cs b/TINKLib/Model/Connector/FilteredConnector.cs
index e9d3a59..629ed29 100644
--- a/TINKLib/Model/Connector/FilteredConnector.cs
+++ b/TINKLib/Model/Connector/FilteredConnector.cs
@@ -1,17 +1,17 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using TINK.Model.Bikes;
 using TINK.Model.Connector.Filter;
 using TINK.Model.Services.CopriApi;
-using TINK.Model.Station;
-
+using TINK.Model.Stations;
+using TINK.Model.Stations.StationNS;
 using BikeInfo = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo;
 
 namespace TINK.Model.Connector
 {
-	/// <summary> Filters connector respones.</summary>
+	/// <summary> Filters connector responses.</summary>
 	/// <remarks>Former name: Filter</remarks>
 	public class FilteredConnector : IFilteredConnector
 	{
@@ -50,7 +50,7 @@ namespace TINK.Model.Connector
 			/// <summary> Holds the filter. </summary>
 			private IGroupFilter Filter { get; }
 
-			/// <summary> Holds the reference to object which performs copry queries.</summary>
+			/// <summary> Holds the reference to object which performs copri queries.</summary>
 			private IQuery m_oInnerQuery;
 
 			/// <summary> Constructs a query object.</summary>
@@ -111,7 +111,7 @@ namespace TINK.Model.Connector
 				return bikes.Where(x => filter.DoFilter(x.Group).Count() > 0).ToDictionary(x => x.Id);
 			}
 
-			/// <summary> Filter stations by broup. </summary>
+			/// <summary> Filter stations by group. </summary>
 			/// <returns></returns>
 			private static Dictionary<string, IStation> DoFilter(StationDictionary stations, IGroupFilter filter)
 			{
diff --git a/TINKLib/Model/Connector/NullFilterConnector.cs b/TINKLib/Model/Connector/NullFilterConnector.cs
index 96fca26..f979858 100644
--- a/TINKLib/Model/Connector/NullFilterConnector.cs
+++ b/TINKLib/Model/Connector/NullFilterConnector.cs
@@ -1,16 +1,16 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using TINK.Model.Bikes;
 using TINK.Model.Services.CopriApi;
-using TINK.Model.Station;
-
+using TINK.Model.Stations;
+using TINK.Model.Stations.StationNS;
 using BikeInfo = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo;
 
 namespace TINK.Model.Connector
 {
-	/// <summary> Filters connector respones.</summary>
+	/// <summary> Filters connector responses.</summary>
 	public class NullFilterConnector : IFilteredConnector
 	{
 		/// <summary> Constructs a filter object. </summary>
@@ -44,7 +44,7 @@ namespace TINK.Model.Connector
 		/// <summary> Object to perform filtered queries.</summary>
 		private class QueryProvider : IQuery
 		{
-			/// <summary> Holds the reference to object which performs copry queries.</summary>
+			/// <summary> Holds the reference to object which performs copri queries.</summary>
 			private IQuery m_oInnerQuery;
 
 			/// <summary> Constructs a query object.</summary>
@@ -100,7 +100,7 @@ namespace TINK.Model.Connector
 				return bikes.Where(x => x.Group.Intersect(filter).Count() > 0).ToDictionary(x => x.Id);
 			}
 
-			/// <summary> Filter stations by broup. </summary>
+			/// <summary> Filter stations by group. </summary>
 			/// <returns></returns>
 			public static Dictionary<string, IStation> DoFilter(StationDictionary stations, IEnumerable<string> p_oFilter)
 			{
diff --git a/TINKLib/Model/Connector/Query/CachedQuery.cs b/TINKLib/Model/Connector/Query/CachedQuery.cs
index 2c0e631..68ce6d5 100644
--- a/TINKLib/Model/Connector/Query/CachedQuery.cs
+++ b/TINKLib/Model/Connector/Query/CachedQuery.cs
@@ -29,7 +29,7 @@ namespace TINK.Model.Connector
 			}
 		}
 
-		/// <summary> Gets all stations including postions and bikes.</summary>
+		/// <summary> Gets all stations including positions and bikes.</summary>
 		public async Task<Result<StationsAndBikesContainer>> GetBikesAndStationsAsync()
 		{
 			var resultStations = await server.GetStations();
@@ -73,7 +73,7 @@ namespace TINK.Model.Connector
 		/// <returns>Collection of bikes.</returns>
 		public async Task<Result<BikeCollection>> GetBikesOccupiedAsync()
 		{
-			Log.ForContext<CachedQuery>().Error("Unexpected call to get be bikes occpied detected. No user is logged in.");
+			Log.ForContext<CachedQuery>().Error("Unexpected call to get be bikes occupied detected. No user is logged in.");
 
 			return new Result<BikeCollection>(
 				typeof(CopriCallsMonkeyStore),
diff --git a/TINKLib/Model/Connector/Query/CachedQueryLoggedIn.cs b/TINKLib/Model/Connector/Query/CachedQueryLoggedIn.cs
index 8b8d87b..c9d3611 100644
--- a/TINKLib/Model/Connector/Query/CachedQueryLoggedIn.cs
+++ b/TINKLib/Model/Connector/Query/CachedQueryLoggedIn.cs
@@ -29,7 +29,7 @@ namespace TINK.Model.Connector
 			}
 		}
 
-		/// <summary> Gets all stations including postions.</summary>
+		/// <summary> Gets all stations including positions.</summary>
 		public async Task<Result<StationsAndBikesContainer>> GetBikesAndStationsAsync()
 		{
 			var stationsResponse = await Server.GetStations();
diff --git a/TINKLib/Model/Connector/Query/IQuery.cs b/TINKLib/Model/Connector/Query/IQuery.cs
index 6ca9013..40b8987 100644
--- a/TINKLib/Model/Connector/Query/IQuery.cs
+++ b/TINKLib/Model/Connector/Query/IQuery.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using TINK.Model.Bikes;
 using TINK.Model.Services.CopriApi;
 
@@ -6,7 +6,7 @@ namespace TINK.Model.Connector
 {
 	public interface IQuery
 	{
-		/// <summary> Gets all stations including postions.</summary>
+		/// <summary> Gets all stations including positions.</summary>
 		Task<Result<StationsAndBikesContainer>> GetBikesAndStationsAsync();
 
 		/// <summary> Gets bikes occupied is a user is logged in. </summary>
diff --git a/TINKLib/Model/Connector/Query/Query.cs b/TINKLib/Model/Connector/Query/Query.cs
index b517df4..985d9c8 100644
--- a/TINKLib/Model/Connector/Query/Query.cs
+++ b/TINKLib/Model/Connector/Query/Query.cs
@@ -28,7 +28,7 @@ namespace TINK.Model.Connector
 			}
 		}
 
-		/// <summary> Gets all stations including postions.</summary>
+		/// <summary> Gets all stations including positions.</summary>
 		public async Task<Result<StationsAndBikesContainer>> GetBikesAndStationsAsync()
 		{
 			var stationsAllResponse = await server.GetStationsAsync();
@@ -44,7 +44,7 @@ namespace TINK.Model.Connector
 		/// <returns>Collection of bikes.</returns>
 		public async Task<Result<BikeCollection>> GetBikesOccupiedAsync()
 		{
-			Log.ForContext<Query>().Error("Unexpected call to get be bikes occpied detected. No user is logged in.");
+			Log.ForContext<Query>().Error("Unexpected call to get be bikes occupied detected. No user is logged in.");
 			return new Result<BikeCollection>(
 				typeof(CopriCallsMonkeyStore),
 				await Task.FromResult(new BikeCollection(new Dictionary<string, BikeInfo>())),
diff --git a/TINKLib/Model/Connector/Query/QueryLoggedIn.cs b/TINKLib/Model/Connector/Query/QueryLoggedIn.cs
index 871d1c1..0cb3749 100644
--- a/TINKLib/Model/Connector/Query/QueryLoggedIn.cs
+++ b/TINKLib/Model/Connector/Query/QueryLoggedIn.cs
@@ -30,7 +30,7 @@ namespace TINK.Model.Connector
 			server = copriServer as ICopriServer;
 		}
 
-		/// <summary> Gets all stations including postions.</summary>
+		/// <summary> Gets all stations including positions.</summary>
 		public async Task<Result<StationsAndBikesContainer>> GetBikesAndStationsAsync()
 		{
 			var stationResponse = await server.GetStationsAsync();
diff --git a/TINKLib/Model/Connector/TextToTypeHelper.cs b/TINKLib/Model/Connector/TextToTypeHelper.cs
index e577e59..eb56b6f 100644
--- a/TINKLib/Model/Connector/TextToTypeHelper.cs
+++ b/TINKLib/Model/Connector/TextToTypeHelper.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -9,6 +9,7 @@ using TINK.Model.Services.CopriApi.ServerUris;
 using TINK.Model.State;
 using TINK.Repository.Exception;
 using TINK.Repository.Response;
+using TINK.Repository.Response.Stations.Station;
 
 namespace TINK.Model.Connector
 {
@@ -26,7 +27,7 @@ namespace TINK.Model.Connector
 		/// </summary>
 		/// <param name="stationInfo">Object to get information from.</param>
 		/// <returns>Position information.</returns>
-		public static IPosition GetPosition(this StationsAvailableResponse.StationInfo stationInfo)
+		public static IPosition GetPosition(this StationInfo stationInfo)
 			=> GetPosition(stationInfo.gps);
 
 		/// <summary> Gets the position from StationInfo object. </summary>
@@ -52,14 +53,14 @@ namespace TINK.Model.Connector
 			if (group == null || group.Length == 0)
 			{
 				// If not logged in stations groups are empty form COPRI version v4.1.
-				Log.Debug("Can not get goup form string. Group text can not be null.");
+				Log.Debug("Can not get group form string. Group text can not be null.");
 				return new List<string>();
 			}
 
 			return new HashSet<string>(group).ToList();
 		}
 
-		/// <summary> Gets if user acknowldged ags or not. </summary>
+		/// <summary> Gets if user acknowledged AGBs or not. </summary>
 		/// <param name="authorizationResponse">Object to get information from.</param>
 		/// <returns>Position information.</returns>
 		public static bool GetIsAgbAcknowledged(this AuthorizationResponse authorizationResponse)
@@ -77,7 +78,7 @@ namespace TINK.Model.Connector
 		/// <summary> Gets the position from StationInfo object. </summary>
 		/// <param name="stationInfo">Object to get information from.</param>
 		/// <returns>Position information.</returns>
-		public static IEnumerable<string> GetGroup(this StationsAvailableResponse.StationInfo stationInfo)
+		public static IEnumerable<string> GetGroup(this StationInfo stationInfo)
 		{
 			try
 			{
@@ -297,8 +298,19 @@ namespace TINK.Model.Connector
 				? typeOfBike
 				: (TypeOfBike?)null;
 
+		/// <summary>
+		/// Gets whether bike is a AA bike (bike must be always returned a the same station) or AB bike (start and end stations can be different stations).
+		/// </summary>
+		/// <param name="bikeInfo">Object to get AA info from.</param>
+		/// <returns>AA info.</returns>
+		public static AaRideType? GetAaRideType(this BikeInfoBase bikeInfo)
+			=> Enum.TryParse(bikeInfo?.aa_ride, true, out AaRideType aaRide)
+				? aaRide
+				: (AaRideType?)null;
+
+
 		/// <summary> Get position from a ,- separated string. </summary>
-		/// <param name="gps">Text to extract positon from.</param>
+		/// <param name="gps">Text to extract position from.</param>
 		/// <returns>Position object.</returns>
 		public static IPosition GetPosition(Repository.Response.Position gps)
 			=> PositionFactory.Create(
@@ -306,7 +318,7 @@ namespace TINK.Model.Connector
 				double.TryParse(gps?.longitude, NumberStyles.Float, CultureInfo.InvariantCulture, out double longitude) ? longitude : double.NaN);
 
 		/// <summary> Get position from a ,- separated string. </summary>
-		/// <param name="gps">Text to extract positon from.</param>
+		/// <param name="gps">Text to extract position from.</param>
 		/// <returns>Position object.</returns>
 		public static Map.IMapSpan GetMapSpan(this MapSpan mapSpan)
 			=> Map.MapSpanFactory.Create(
@@ -343,7 +355,7 @@ namespace TINK.Model.Connector
 		/// Gets the operator Uri from response.
 		/// </summary>
 		/// <param name="bikeInfo"> Response to get uri from.</param>
-		/// <returns>Operatore Uri</returns>
+		/// <returns>Operator Uri</returns>
 		public static Uri GetOperatorUri(this BikeInfoBase bikeInfo)
 		{
 			return bikeInfo?.uri_operator != null && !string.IsNullOrEmpty(bikeInfo?.uri_operator)
@@ -351,7 +363,7 @@ namespace TINK.Model.Connector
 				: null;
 		}
 
-		/// <summary> Tries to get the copriversion from response.</summary>
+		/// <summary> Tries to get the copri version from response.</summary>
 		/// <param name="response">Response to get version info from.</param>
 		/// <returns>COPRI version</returns>
 		public static bool TryGetCopriVersion(this CopriVersion response, out Version copriVersion)
@@ -362,7 +374,7 @@ namespace TINK.Model.Connector
 				&& Version.TryParse(response.copri_version, out copriVersion);
 		}
 
-		/// <summary> Gets the copriversion from.</summary>
+		/// <summary> Gets the copri version from.</summary>
 		/// <param name="response">Response to get version info from.</param>
 		/// <returns>COPRI version</returns>
 		public static Version GetCopriVersion(this CopriVersion response)
diff --git a/TINKLib/Model/Connector/Updater/BikeInfoFactory.cs b/TINKLib/Model/Connector/Updater/BikeInfoFactory.cs
index cc85858..fba4800 100644
--- a/TINKLib/Model/Connector/Updater/BikeInfoFactory.cs
+++ b/TINKLib/Model/Connector/Updater/BikeInfoFactory.cs
@@ -7,7 +7,6 @@ using TINK.Model.MiniSurvey;
 using TINK.Model.State;
 using TINK.Repository.Response;
 using BikeExtension = TINK.Model.Bikes.BikeInfoNS.BikeNS.BikeExtension;
-using BikeInfo = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo;
 
 namespace TINK.Model.Connector.Updater
 {
@@ -63,7 +62,7 @@ namespace TINK.Model.Connector.Updater
 
 			var lockType = lockModel.HasValue
 				? BikeExtension.GetLockType(lockModel.Value)
-				: BikeExtension.GetLockType(DEFAULTLOCKMODEL); // Map bikes without "system"- entry in response to backend- locks.  
+				: BikeExtension.GetLockType(DEFAULTLOCKMODEL); // Map bikes without "system"- entry in response to back end- locks.  
 
 			try
 			{
@@ -76,6 +75,7 @@ namespace TINK.Model.Connector.Updater
 								  LockModel.Sigo,
 								  bikeInfo.GetWheelType(),
 								  bikeInfo.GetTypeOfBike(),
+								  bikeInfo.GetAaRideType(),
 								  bikeInfo.description),
 							  DriveFactory.Create(bikeInfo?.bike_type),
 							  dataSource,
@@ -94,7 +94,7 @@ namespace TINK.Model.Connector.Updater
 							  bikeInfo.GetGroup(),
 							  miniSurvey: bikeInfo.user_miniquery != null
 								? new MiniSurveyModel(new Dictionary<string, IQuestionModel> {
-									{ "q1", new QuestionModel()} // Add a dummy querry. Querries are not yet read from COPRI but compiled into the app.
+									{ "q1", new QuestionModel()} // Add a dummy query. Queries are not yet read from COPRI but compiled into the app.
                                 })
 								: new MiniSurveyModel(),
 							  co2Saving: bikeInfo.co2saving);
@@ -106,6 +106,7 @@ namespace TINK.Model.Connector.Updater
 									LockModel.ILockIt,
 									bikeInfo.GetWheelType(),
 									bikeInfo.GetTypeOfBike(),
+									bikeInfo.GetAaRideType(),
 									bikeInfo.description),
 								DriveFactory.Create(bikeInfo?.bike_type),
 								dataSource,
@@ -129,7 +130,7 @@ namespace TINK.Model.Connector.Updater
 			}
 			catch (ArgumentException ex)
 			{
-				// Contructor reported invalid arguemts (missing lock id, ....).
+				// Constructor reported invalid arguments (missing lock id, ....).
 				Log.Error($"Can not create new {nameof(BikeInfo)}-object from {nameof(BikeInfoAvailable)} argument. Invalid response detected. Available bike with id {bikeInfo.bike} skipped. {ex.Message}");
 				return null;
 			}
@@ -184,6 +185,7 @@ namespace TINK.Model.Connector.Updater
 										LockModel.ILockIt,
 										bikeInfo.GetWheelType(),
 										bikeInfo.GetTypeOfBike(),
+										bikeInfo.GetAaRideType(),
 										bikeInfo.description),
 									DriveFactory.Create(bikeInfo?.bike_type),
 									dataSource,
@@ -214,6 +216,7 @@ namespace TINK.Model.Connector.Updater
 										LockModel.Sigo,
 										bikeInfo.GetWheelType(),
 										bikeInfo.GetTypeOfBike(),
+										bikeInfo.GetAaRideType(),
 										bikeInfo.description),
 									DriveFactory.Create(bikeInfo?.bike_type),
 									dataSource,
@@ -238,7 +241,7 @@ namespace TINK.Model.Connector.Updater
 					}
 					catch (ArgumentException ex)
 					{
-						// Contructor reported invalid arguemts (missing lock id, ....).
+						// Constructor reported invalid arguments (missing lock id, ....).
 						Log.Error($"Can not create new {nameof(BikeInfo)}-object from {nameof(BikeInfoReservedOrBooked)} argument. Invalid response detected. Reserved bike with id {bikeInfo.bike} skipped. {ex.Message}");
 						return null;
 					}
@@ -255,6 +258,7 @@ namespace TINK.Model.Connector.Updater
 										LockModel.ILockIt,
 										bikeInfo.GetWheelType(),
 										bikeInfo.GetTypeOfBike(),
+										bikeInfo.GetAaRideType(),
 										bikeInfo.description),
 									DriveFactory.Create(bikeInfo?.bike_type),
 									dataSource,
@@ -278,29 +282,8 @@ namespace TINK.Model.Connector.Updater
 									bikeInfo.GetGroup());
 
 							case LockModel.BordComputer:
-								return new BikeInfo(
-									new Bike(
-										bikeInfo.bike,
-										LockModel.BordComputer,
-										bikeInfo.GetWheelType(),
-										bikeInfo.GetTypeOfBike(),
-										bikeInfo.description),
-									DriveFactory.Create(bikeInfo?.bike_type),
-									dataSource,
-									bikeInfo.GetIsDemo(),
-									bikeInfo.GetGroup(),
-									bikeInfo.station,
-									bikeInfo.GetOperatorUri(),
-#if !NOTARIFFDESCRIPTION
-									bikeInfo.rental_description != null
-										? RentalDescriptionFactory.Create(bikeInfo.rental_description)
-										: TariffDescriptionFactory.Create(bikeInfo.tariff_description),
-#else
-                                    Create((TINK.Repository.Response.TariffDescription)null),
-#endif
-									bikeInfo.GetFrom(),
-									mailAddress,
-									bikeInfo.timeCode);
+								throw new NotSupportedException($"Bikes with lock model of type {lockModel} are no more supported.");
+
 							default:
 								return new Bikes.BikeInfoNS.CopriLock.BikeInfo(
 										new Bike(
@@ -308,6 +291,7 @@ namespace TINK.Model.Connector.Updater
 											LockModel.Sigo,
 											bikeInfo.GetWheelType(),
 											bikeInfo.GetTypeOfBike(),
+											bikeInfo.GetAaRideType(),
 											bikeInfo.description),
 										DriveFactory.Create(bikeInfo?.bike_type),
 										DataSource.Copri,
diff --git a/TINKLib/Model/Connector/Updater/UpdaterJSON.cs b/TINKLib/Model/Connector/Updater/UpdaterJSON.cs
index 7fbcf35..1f07055 100644
--- a/TINKLib/Model/Connector/Updater/UpdaterJSON.cs
+++ b/TINKLib/Model/Connector/Updater/UpdaterJSON.cs
@@ -1,17 +1,14 @@
 using System;
-using System.Collections.Generic;
-using Serilog;
-using TINK.Model.Bikes;
 using TINK.Model.Bikes.BikeInfoNS.BC;
 using TINK.Model.State;
-using TINK.Model.Station;
-using TINK.Model.Station.Operator;
+using TINK.Model.Stations;
+using TINK.Model.Stations.StationNS.Operator;
 using TINK.Model.User.Account;
 using TINK.Repository.Exception;
 using TINK.Repository.Response;
+using TINK.Repository.Response.Stations;
 using TINK.Services.CopriApi;
 using Xamarin.Forms;
-using BikeInfo = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo;
 using IBikeInfoMutable = TINK.Model.Bikes.BikeInfoNS.BC.IBikeInfoMutable;
 
 namespace TINK.Model.Connector.Updater
@@ -31,7 +28,7 @@ namespace TINK.Model.Connector.Updater
 			=> bike.State.Load(InUseStateEnum.Disposable, notifyLevel: notifyLevel);
 
 		/// <summary>
-		/// Gets all statsion for station provider and add them into station list.
+		/// Gets all station for station provider and add them into station list.
 		/// </summary>
 		/// <param name="p_oStationList">List of stations to update.</param>
 		public static StationDictionary GetStationsAllMutable(this StationsAvailableResponse stationsAllResponse)
@@ -57,7 +54,7 @@ namespace TINK.Model.Connector.Updater
 						string.Format("Station id {0} is not unique.", station.Value.station), stationsAllResponse);
 				}
 
-				stations.Add(new Station.Station(
+				stations.Add(new Stations.StationNS.Station(
 					station.Value.station,
 					station.Value.GetGroup(),
 					station.Value.GetPosition(),
@@ -89,7 +86,7 @@ namespace TINK.Model.Connector.Updater
 				 new ResourceUrls(response.tariff_info_html, response.bike_info_html, response.agb_html, response.privacy_html, response.impress_html));
 
 		/// <summary> Gets account object from login response.</summary>
-		/// <param name="merchantId">Needed to extract cookie from autorization response.</param>
+		/// <param name="merchantId">Needed to extract cookie from authorization response.</param>
 		/// <param name="loginResponse">Response to get session cookie and debug level from.</param>
 		/// <param name="mail">Mail address needed to construct a complete account object (is not part of response).</param>
 		/// <param name="password">Password needed to construct a complete account object (is not part of response).</param>
diff --git a/TINKLib/Model/GroupFilterHelper.cs b/TINKLib/Model/GroupFilterHelper.cs
index caad842..1c9a7db 100644
--- a/TINKLib/Model/GroupFilterHelper.cs
+++ b/TINKLib/Model/GroupFilterHelper.cs
@@ -1,11 +1,11 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using TINK.Model.Connector;
 using TINK.ViewModel.Map;
 using TINK.ViewModel.Settings;
 
 namespace TINK.Model
 {
-	/// <summary> Holds collecion of filters to filter options (TINK, Konrad, ....).     </summary>
+	/// <summary> Holds collection of filters to filter options (TINK, Konrad, ....).     </summary>
 	/// <remarks> Former name: FilterCollection.</remarks>
 	public static class GroupFilterHelper
 	{
diff --git a/TINKLib/Model/ITinkApp.cs b/TINKLib/Model/ITinkApp.cs
index 53d3173..5e43e0f 100644
--- a/TINKLib/Model/ITinkApp.cs
+++ b/TINKLib/Model/ITinkApp.cs
@@ -7,7 +7,7 @@ using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Model.Services.CopriApi.ServerUris;
 using TINK.Model.Settings;
-using TINK.Model.Station;
+using TINK.Model.Stations.StationNS;
 using TINK.Services;
 using TINK.Services.BluetoothLock;
 using TINK.Settings;
@@ -46,15 +46,15 @@ namespace TINK.Model
 		/// <summary> Name of the station which is selected. </summary>
 		IStation SelectedStation { get; set; }
 
-		/// <summary>Polling periode.</summary>
+		/// <summary>Polling period.</summary>
 		PollingParameters Polling { get; set; }
 
 		TimeSpan ExpiresAfter { get; set; }
 
-		/// <summary> Holds status about whants new page. </summary>
+		/// <summary> Holds status about whats new page. </summary>
 		WhatsNew WhatsNew { get; }
 
-		/// <summary> Gets whether device is connected to internet or not. </summary>
+		/// <summary> Gets whether device is connected to Internet or not. </summary>
 		bool GetIsConnected();
 
 		/// <summary> Action to post to GUI thread.</summary>
@@ -69,7 +69,7 @@ namespace TINK.Model
 		/// <summary>Settings determining the startup behavior of the app.</summary>
 		IStartupSettings StartupSettings { get; }
 
-		/// <summary> Value indicating whether map is centerted to current position or not. </summary>
+		/// <summary> Value indicating whether map is centered to current position or not. </summary>
 		bool CenterMapToCurrentLocation { get; set; }
 
 		/// <summary> Holds the map area where user is or was located or null if position is unknown. </summary>
@@ -98,7 +98,7 @@ namespace TINK.Model
 		/// <summary> Holds the different lock service implementations.</summary>
 		LocksServicesContainerMutable LocksServices { get; }
 
-		/// <summary> Holds the flavor of the app, i.e. specifies if app is sharee.bike, Mein konrad or Lastenrad Bayern.</summary>
+		/// <summary> Holds the flavor of the app, i.e. specifies if app is sharee.bike, Mein konrad or LastenRad Bayern.</summary>
 		AppFlavor Flavor { get; }
 
 		/// <summary> Holds available app themes.</summary>
@@ -113,7 +113,7 @@ namespace TINK.Model
 		/// <summary> Holds the external path. </summary>
 		string ExternalFolder { get; }
 
-		/// <summary> Holds the stations availalbe. </summary>
+		/// <summary> Holds the stations centered. </summary>
 		IEnumerable<IStation> Stations { get; set; }
 
 		/// <summary> Holds the Urs to query resources from. </summary>
diff --git a/TINKLib/Model/Logging/LoggingDirectoryManager.cs b/TINKLib/Model/Logging/LoggingDirectoryManager.cs
index b6bf227..0632c01 100644
--- a/TINKLib/Model/Logging/LoggingDirectoryManager.cs
+++ b/TINKLib/Model/Logging/LoggingDirectoryManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -25,7 +25,7 @@ namespace TINK.Model.Logging
 
 			if (directoryExistsChecker == null)
 			{
-				throw new ArgumentException($"Can not instantiate {nameof(LoggingDirectoryManager)}- object. Directory existance checker delegate can not be null.");
+				throw new ArgumentException($"Can not instantiate {nameof(LoggingDirectoryManager)}- object. Directory existence checker delegate can not be null.");
 			}
 
 			if (directoryCreator == null)
@@ -42,7 +42,7 @@ namespace TINK.Model.Logging
 
 			if (string.IsNullOrEmpty(directorySeparatorChar.ToString()))
 			{
-				throw new ArgumentException($"Can not instantiate {nameof(LoggingDirectoryManager)}- object. Directory separtor character can not be null or empty.");
+				throw new ArgumentException($"Can not instantiate {nameof(LoggingDirectoryManager)}- object. Directory separator character can not be null or empty.");
 			}
 
 			if (p_iRetainedFilesCountLimit < 1)
diff --git a/TINKLib/Model/NullPostion.cs b/TINKLib/Model/NullPostion.cs
index 0b91a46..b5dce9e 100644
--- a/TINKLib/Model/NullPostion.cs
+++ b/TINKLib/Model/NullPostion.cs
@@ -1,9 +1,9 @@
-
+
 namespace TINK.Model
 {
-	public class NullPostion : IPosition
+	public class NullPosition : IPosition
 	{
-		internal NullPostion() { }
+		internal NullPosition() { }
 
 		public double Latitude => double.NaN;
 
diff --git a/TINKLib/Model/PositionFactory.cs b/TINKLib/Model/PositionFactory.cs
index 5cb3739..7954775 100644
--- a/TINKLib/Model/PositionFactory.cs
+++ b/TINKLib/Model/PositionFactory.cs
@@ -6,6 +6,6 @@ namespace TINK.Model
 		public static IPosition Create(double latitude = double.NaN, double longitude = double.NaN)
 			=> Position.GetIsValid(longitude, latitude)
 				? new Position(latitude, longitude) as IPosition
-				: new NullPostion();
+				: new NullPosition();
 	}
 }
diff --git a/TINKLib/Model/Settings/JsonSettingsDictionary.cs b/TINKLib/Model/Settings/JsonSettingsDictionary.cs
index 8a34d7b..2033453 100644
--- a/TINKLib/Model/Settings/JsonSettingsDictionary.cs
+++ b/TINKLib/Model/Settings/JsonSettingsDictionary.cs
@@ -194,7 +194,7 @@ namespace TINK.Model.Settings
 		}
 
 
-		/// <summary> Sets whether polling is on or off and the periode if polling is on. </summary>
+		/// <summary> Sets whether polling is on or off and the period if polling is on. </summary>
 		/// <param name="settingsJSON">Dictionary to write entries to.</param>
 		public static Dictionary<string, string> SetPollingParameters(
 			this IDictionary<string, string> targetDictionary,
@@ -210,19 +210,19 @@ namespace TINK.Model.Settings
 			}).ToDictionary(key => key.Key, value => value.Value);
 		}
 
-		/// <summary> Get whether polling is on or off and the periode if polling is on. </summary>
+		/// <summary> Get whether polling is on or off and the period if polling is on. </summary>
 		/// <param name="settingsJSON">Dictionary holding parameters from JSON.</param>
 		/// <returns>Polling parameters.</returns>
 		public static PollingParameters GetPollingParameters(this IDictionary<string, string> settingsJSON)
 		{
-			// Check if dictionary contains entry for periode.
-			if (settingsJSON.TryGetValue($"{typeof(PollingParameters).Name}_{typeof(TimeSpan).Name}", out string periode)
+			// Check if dictionary contains entry for period.
+			if (settingsJSON.TryGetValue($"{typeof(PollingParameters).Name}_{typeof(TimeSpan).Name}", out string period)
 				&& settingsJSON.TryGetValue($"{typeof(PollingParameters).Name}_{typeof(bool).Name}", out string active)
-				&& !string.IsNullOrEmpty(periode)
+				&& !string.IsNullOrEmpty(period)
 				&& !string.IsNullOrEmpty(active))
 			{
 				return new PollingParameters(
-					JsonConvert.DeserializeObject<TimeSpan>(periode),
+					JsonConvert.DeserializeObject<TimeSpan>(period),
 					JsonConvert.DeserializeObject<bool>(active));
 			}
 
diff --git a/TINKLib/Model/Settings/PollingParameters.cs b/TINKLib/Model/Settings/PollingParameters.cs
index 9c8b0d0..031c8ce 100644
--- a/TINKLib/Model/Settings/PollingParameters.cs
+++ b/TINKLib/Model/Settings/PollingParameters.cs
@@ -16,15 +16,15 @@ namespace TINK.Settings
 			false);
 
 		/// <summary> Constructs a polling parameter object. </summary>
-		/// <param name="periode">Polling periode.</param>
+		/// <param name="period">Polling period.</param>
 		/// <param name="activated">True if polling is activated.</param>
-		public PollingParameters(TimeSpan periode, bool activated)
+		public PollingParameters(TimeSpan period, bool activated)
 		{
-			Periode = periode; // Can not be null because is a struct.
+			Periode = period; // Can not be null because is a struct.
 			IsActivated = activated;
 		}
 
-		/// <summary>Holds the polling periode.</summary>
+		/// <summary>Holds the polling period.</summary>
 		public TimeSpan Periode { get; }
 
 		/// <summary> Holds value whether polling is activated or not.</summary>
diff --git a/TINKLib/Model/Settings/Settings.cs b/TINKLib/Model/Settings/Settings.cs
index 1834a68..813e498 100644
--- a/TINKLib/Model/Settings/Settings.cs
+++ b/TINKLib/Model/Settings/Settings.cs
@@ -18,7 +18,7 @@ namespace TINK.Model.Settings
 		public const bool DEFAULTREPOTLEVEL = false;
 
 		/// <summary> Gets the type of the default geolocation service. </summary>
-		/// <remarks> Swtiched from GeolocationService (GeolocationAccuracyMediumService) to GeolocationAccuracyHighService in app version 3.0.290.</remarks>
+		/// <remarks> Switched from GeolocationService (GeolocationAccuracyMediumService) to GeolocationAccuracyHighService in app version 3.0.290.</remarks>
 		public static Type DefaultLocationService => typeof(GeolocationAccuracyHighService);
 
 		// Default value of the expires after entry. Controls the expiration time of the cache values.
@@ -54,8 +54,8 @@ namespace TINK.Model.Settings
 			bool? isSiteCachingOn = null,
 			string activeTheme = null)
 		{
-			GroupFilterMapPage = groupFilterMapPage ?? new GroupFilterMapPage(); // Default behaviour: No filtering.
-			GroupFilterSettings = groupFilterSettings ?? new GroupFilterSettings(); // Default behaviour: No filtering.
+			GroupFilterMapPage = groupFilterMapPage ?? new GroupFilterMapPage(); // Default behavior: No filtering.
+			GroupFilterSettings = groupFilterSettings ?? new GroupFilterSettings(); // Default behavior: No filtering.
 			StartupSettings = startupSettings ?? new StartupSettings();
 			ActiveUri = GetActiveUri(activeUri);
 			PollingParameters = pollingParameters ?? PollingParameters.Default;
@@ -64,7 +64,7 @@ namespace TINK.Model.Settings
 			ExpiresAfter = expiresAfter ?? DEFAULTEXPIRESAFTER;
 			ActiveLockService = activeLockService ?? LocksServicesContainerMutable.DefaultLocksservice;
 			ConnectTimeout = connectTimeout ?? new TimeSpan(0, 0, TimeOutProvider.DEFAULT_BLUETOOTHCONNECT_TIMEOUTSECONDS); // Try one sec. to connect. 
-			ActiveGeolocationService = activeGeolocationService ?? DefaultLocationService.Name;
+			ActiveGeolocationService = activeGeolocationService ?? DefaultLocationService.FullName;
 			CenterMapToCurrentLocation = centerMapToCurrentLocation ?? GetCenterMapToCurrentLocation(activeUri);
 			MapSpan = mapSpan;
 			LogToExternalFolder = logToExternalFolder ?? false;
@@ -78,7 +78,7 @@ namespace TINK.Model.Settings
 		/// <summary> Holds the filters loaded from settings. </summary>
 		public IGroupFilterSettings GroupFilterSettings { get; }
 
-		/// <summary> Holds the stettings determining app startup behavior. </summary>
+		/// <summary> Holds the settings determining app startup behavior. </summary>
 		public IStartupSettings StartupSettings { get; }
 
 		/// <summary> Holds the uri to connect to. </summary>
@@ -102,7 +102,7 @@ namespace TINK.Model.Settings
 		/// <summary> Gets the geolocation service to use.</summary>
 		public string ActiveGeolocationService { get; }
 
-		/// <summary> True if map is centered to current positon, false if not to center map.</summary>
+		/// <summary> True if map is centered to current position, false if not to center map.</summary>
 		public bool CenterMapToCurrentLocation { get; }
 
 		/// <summary> Holds the map area to display. </summary>
@@ -121,7 +121,7 @@ namespace TINK.Model.Settings
 
 		public static bool GetCenterMapToCurrentLocation(Uri activeUri)
 		{
-			// TINK does not require acess to current location. Deactivate center map to current location for this reason. 
+			// TINK does not require access to current location. Deactivate center map to current location for this reason. 
 			return !GetActiveUri(activeUri).Host.GetIsCopri();
 		}
 	}
diff --git a/TINKLib/Model/State/StateInfoMutable.cs b/TINKLib/Model/State/StateInfoMutable.cs
index 241308f..04cb2f7 100644
--- a/TINKLib/Model/State/StateInfoMutable.cs
+++ b/TINKLib/Model/State/StateInfoMutable.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace TINK.Model.State
 {
@@ -262,7 +262,7 @@ namespace TINK.Model.State
 				if (_RemainingTime.HasValue == false)
 				{
 					// Value was not yet querried.
-					// Do querry before returning object.
+					// Do query before returning object.
 					_StateInfo.GetIsStillReserved(out _RemainingTime);
 				}
 
diff --git a/TINKLib/Model/Station/StationCollection.cs b/TINKLib/Model/Stations/StationCollection.cs
similarity index 94%
rename from TINKLib/Model/Station/StationCollection.cs
rename to TINKLib/Model/Stations/StationCollection.cs
index da1602a..56b2b77 100644
--- a/TINKLib/Model/Station/StationCollection.cs
+++ b/TINKLib/Model/Stations/StationCollection.cs
@@ -1,8 +1,9 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
+using TINK.Model.Stations.StationNS;
 
-namespace TINK.Model.Station
+namespace TINK.Model.Stations
 {
 	public class StationDictionary : IEnumerable<IStation>
 	{
@@ -31,7 +32,7 @@ namespace TINK.Model.Station
 		}
 
 		/// <summary>
-		/// Deteermines whether a station by given key exists.
+		/// Determines whether a station by given key exists.
 		/// </summary>
 		/// <param name="key">Key to check.</param>
 		/// <returns>True if station exists.</returns>
diff --git a/TINKLib/Model/Station/IStation.cs b/TINKLib/Model/Stations/StationNS/IStation.cs
similarity index 80%
rename from TINKLib/Model/Station/IStation.cs
rename to TINKLib/Model/Stations/StationNS/IStation.cs
index 778d487..920883a 100644
--- a/TINKLib/Model/Station/IStation.cs
+++ b/TINKLib/Model/Stations/StationNS/IStation.cs
@@ -1,7 +1,7 @@
-using System.Collections.Generic;
-using TINK.Model.Station.Operator;
+using System.Collections.Generic;
+using TINK.Model.Stations.StationNS.Operator;
 
-namespace TINK.Model.Station
+namespace TINK.Model.Stations.StationNS
 {
 	public interface IStation
 	{
diff --git a/TINKLib/Model/Station/NullStation.cs b/TINKLib/Model/Stations/StationNS/NullStation.cs
similarity index 84%
rename from TINKLib/Model/Station/NullStation.cs
rename to TINKLib/Model/Stations/StationNS/NullStation.cs
index 50e2e4e..55ab9e6 100644
--- a/TINKLib/Model/Station/NullStation.cs
+++ b/TINKLib/Model/Stations/StationNS/NullStation.cs
@@ -1,7 +1,7 @@
-using System.Collections.Generic;
-using TINK.Model.Station.Operator;
+using System.Collections.Generic;
+using TINK.Model.Stations.StationNS.Operator;
 
-namespace TINK.Model.Station
+namespace TINK.Model.Stations.StationNS
 {
 	/// <summary> Holds object representing null station.</summary>
 	public class NullStation : IStation
diff --git a/TINKLib/Model/Station/Operator/Data.cs b/TINKLib/Model/Stations/StationNS/Operator/Data.cs
similarity index 93%
rename from TINKLib/Model/Station/Operator/Data.cs
rename to TINKLib/Model/Stations/StationNS/Operator/Data.cs
index 16b6d3b..4a3d066 100644
--- a/TINKLib/Model/Station/Operator/Data.cs
+++ b/TINKLib/Model/Stations/StationNS/Operator/Data.cs
@@ -1,6 +1,6 @@
-using Xamarin.Forms;
+using Xamarin.Forms;
 
-namespace TINK.Model.Station.Operator
+namespace TINK.Model.Stations.StationNS.Operator
 {
 	/// <summary> Holds operator related data.</summary>
 	public class Data : IData
diff --git a/TINKLib/Model/Station/Operator/IData.cs b/TINKLib/Model/Stations/StationNS/Operator/IData.cs
similarity index 87%
rename from TINKLib/Model/Station/Operator/IData.cs
rename to TINKLib/Model/Stations/StationNS/Operator/IData.cs
index 417565d..b709786 100644
--- a/TINKLib/Model/Station/Operator/IData.cs
+++ b/TINKLib/Model/Stations/StationNS/Operator/IData.cs
@@ -1,6 +1,6 @@
-using Xamarin.Forms;
+using Xamarin.Forms;
 
-namespace TINK.Model.Station.Operator
+namespace TINK.Model.Stations.StationNS.Operator
 {
 	public interface IData
 	{
diff --git a/TINKLib/Model/Station/Station.cs b/TINKLib/Model/Stations/StationNS/Station.cs
similarity index 93%
rename from TINKLib/Model/Station/Station.cs
rename to TINKLib/Model/Stations/StationNS/Station.cs
index 34d9964..1023309 100644
--- a/TINKLib/Model/Station/Station.cs
+++ b/TINKLib/Model/Stations/StationNS/Station.cs
@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
-using TINK.Model.Station.Operator;
+using TINK.Model.Stations.StationNS.Operator;
 
-namespace TINK.Model.Station
+namespace TINK.Model.Stations.StationNS
 {
 	/// <summary> Holds station info. </summary>
 	public class Station : IStation
diff --git a/TINKLib/Model/TinkApp.cs b/TINKLib/Model/TinkApp.cs
index 1eddc29..29c7dfc 100644
--- a/TINKLib/Model/TinkApp.cs
+++ b/TINKLib/Model/TinkApp.cs
@@ -13,7 +13,7 @@ using TINK.Model.Device;
 using TINK.Model.Logging;
 using TINK.Model.Services.CopriApi.ServerUris;
 using TINK.Model.Settings;
-using TINK.Model.Station;
+using TINK.Model.Stations.StationNS;
 using TINK.Model.User.Account;
 using TINK.Services;
 using TINK.Services.BluetoothLock;
@@ -42,7 +42,7 @@ namespace TINK.Model
 		public static string MerchantId { get; private set; }
 
 		/// <summary>
-		/// Holds status about whants new page.
+		/// Holds status about whats new page.
 		/// </summary>
 		public WhatsNew WhatsNew { get; private set; }
 
@@ -65,7 +65,7 @@ namespace TINK.Model
 			set => m_oFilterDictionaryMapPage = value ?? new GroupFilterMapPage();
 		}
 
-		/// <summary> Value indicating whether map is centerted to current position or not. </summary>
+		/// <summary> Value indicating whether map is centered to current position or not. </summary>
 		public bool CenterMapToCurrentLocation { get; set; }
 
 		/// <summary> Holds the map area to display when starting app for first time/ when center map to is off. </summary>
@@ -123,7 +123,7 @@ namespace TINK.Model
 		/// <summary> 
 		/// Update connector from filters when
 		/// - login state changes
-		/// - view is toggled (TINK to Kornrad and vice versa)
+		/// - view is toggled (TINK to Konrad and vice versa)
 		/// </summary>
 		public void UpdateConnector()
 		{
@@ -133,7 +133,7 @@ namespace TINK.Model
 				m_oConnector.Connector);
 		}
 
-		/// <summary>Polling periode.</summary>
+		/// <summary>Polling period.</summary>
 		public PollingParameters Polling { get; set; }
 
 		public TimeSpan ExpiresAfter { get; set; }
@@ -155,7 +155,7 @@ namespace TINK.Model
 		/// <param name="accountStore"></param>
 		/// <param name="passwordValidator"></param>
 		/// <param name="p_oConnectorFactory"></param>
-		/// <param name="geolocationService">Null in productive context. Service to querry geoloation for testing purposes. Parameter can be made optional.</param>
+		/// <param name="geolocationService">Null in productive context. Service to query geolocation for testing purposes. Parameter can be made optional.</param>
 		/// <param name="locksService">Null in productive context. Service to control locks/ get locks information for testing proposes. Parameter can be made optional.</param>
 		/// <param name="device">Object allowing platform specific operations.</param>
 		/// <param name="specialFolder"></param>
@@ -303,7 +303,7 @@ namespace TINK.Model
 				throw new ArgumentException($"Can not instantiate {nameof(TinkApp)}- object. Polling parameters must never be null.");
 
 			Polling = (lastVersion  != null && lastVersion < new Version(3, 0, 358))
-				? PollingParameters.Default // Default polling periode was 10s up to 3.0.357. Is 60s for later versions.
+				? PollingParameters.Default // Default polling period was 10s up to 3.0.357. Is 60s for later versions.
 				: settings.PollingParameters;
 
 			AppVersion = currentVersion ?? new Version(3, 0, 122);
@@ -342,7 +342,7 @@ namespace TINK.Model
 		/// <summary> Holds delegate to determine whether device is connected or not.</summary>
 		private readonly Func<bool> isConnectedFunc;
 
-		/// <summary> Gets whether device is connected to internet or not. </summary>
+		/// <summary> Gets whether device is connected to Internet or not. </summary>
 		public bool GetIsConnected() => isConnectedFunc();
 
 		/// <summary> Holds the folder where settings files are stored. </summary>
@@ -365,8 +365,8 @@ namespace TINK.Model
 		/// <summary> Name of the station which is selected. </summary>
 		public IStation SelectedStation { get; set; } = new NullStation();
 
-		/// <summary> Holds the stations availalbe. </summary>
-		public IEnumerable<IStation> Stations { get; set; } = new List<Station.Station>();
+		/// <summary> Holds the stations centered. </summary>
+		public IEnumerable<IStation> Stations { get; set; } = new List<Station>();
 
 		public IResourceUrls ResourceUrls { get; set; } = new ResourceUrls();
 
diff --git a/TINKLib/Model/User/Account/Account.cs b/TINKLib/Model/User/Account/Account.cs
index b85ba0f..8fd1a6d 100644
--- a/TINKLib/Model/User/Account/Account.cs
+++ b/TINKLib/Model/User/Account/Account.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -10,15 +10,15 @@ namespace TINK.Model.User.Account
 	{
 		None = 0, // No extra permissions.
 		PickCopriServer = 2, // Allows user to switch COPRI server.
-		ManageCopriCacheExpiration = 4, // Allows to manage the livetime of COPRI cache entries.
-		ManagePolling = 8, // Turn polling off or on and set pollig frequency.
-		PickLockServiceImplementation = 16, // Allows to pick the implementation which controls bluetooth lock mangement.
+		ManageCopriCacheExpiration = 4, // Allows to manage the live time of COPRI cache entries.
+		ManagePolling = 8, // Turn polling off or on and set polling frequency.
+		PickLockServiceImplementation = 16, // Allows to pick the implementation which controls bluetooth lock management.
 		PickLocationServiceImplementation = 32, // Allows to pick the implementation which gets location information.
 		PickLoggingLevel = 64, // Allows to select the logging level.
 		ShowDiagnostics = 128, // Turns on display of diagnostics.
 		SwitchNoSiteCaching = 1024, // Allows to turn off/ on caching of  sites displayed in app hosted by COPRI
 		ReportLevel = 2048, // Allows extent to show error messages.
-		SwitchTheme = 4096, // Allows user to switch theme (sharee.bike, Meinkonrad, Lastenrad Bayern)
+		SwitchTheme = 4096, // Allows user to switch theme (sharee.bike, Mein konrad, LastenRad Bayern)
 		All = PickCopriServer +
 			ManageCopriCacheExpiration +
 			ManagePolling +
@@ -57,7 +57,7 @@ namespace TINK.Model.User.Account
 		/// <param name="mail">Mail address of the account holder.</param>
 		/// <param name="password">Password.</param>
 		/// <param name="sessionCookie">Session cookie from copri.</param>
-		/// <param name="bikeGroup">Group holdig info about Group (TINK, Konrad, ...)</param>
+		/// <param name="bikeGroup">Group holding info about Group (TINK, Konrad, ...)</param>
 		/// <param name="p_iDebugLevel">Flag which controls display of debug settings.</param>
 		public Account(
 			string mail,
@@ -87,7 +87,7 @@ namespace TINK.Model.User.Account
 		/// <summary>Password of to authenticate.</summary>
 		public string Pwd { get; }
 
-		/// <summary>True if user acknowleged agbs.</summary>
+		/// <summary>True if user acknowledged AGBs.</summary>
 		public bool IsAgbAcknowledged { get; }
 
 		/// <summary>Session cookie used to sign in to copri.</summary>
diff --git a/TINKLib/Model/WhatsNew.cs b/TINKLib/Model/WhatsNew.cs
index 8de4baf..0cfd0e7 100644
--- a/TINKLib/Model/WhatsNew.cs
+++ b/TINKLib/Model/WhatsNew.cs
@@ -683,8 +683,8 @@ namespace TINK.Model
 					new List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
 				},
 				{
-					new Version(3, 0, 362),
-					AppResources.ChangeLog_3_0_362_MK_SB,
+					new Version(3, 0, 363),
+					AppResources.ChangeLog_3_0_363_MK_SB,
 					new List<AppFlavor> { AppFlavor.MeinKonrad, AppFlavor.ShareeBike }
 				},
 		};
@@ -693,7 +693,7 @@ namespace TINK.Model
 		/// <param name="currentVersion">Current version of the app.</param>
 		/// <param name="lastVersion">Version of app which was used before this session, null if app is installed for the first time.</param>
 		/// <param name="shownInVersion">Null or version in which whats new dialog was shown last. Used to determine if AGB dialog has to be shown.</param>
-		/// <param name="flavor">Flavor of the app, i.e. specified if app is sharee.bike, Lastenrad Bayern, ...</param>
+		/// <param name="flavor">Flavor of the app, i.e. specified if app is sharee.bike, LastenRad Bayern, ...</param>
 		/// <param name="platform">Platform on which app is running.</param>
 		/// <param name="messages">Messages to inject for testing.</param>
 		public WhatsNew(
@@ -727,7 +727,7 @@ namespace TINK.Model
 			IsShowRequired = true;
 		}
 
-		/// <summary> Gets or sets value whehter whats new was alreay shonw in current settion or not. </summary>
+		/// <summary> Gets or sets value whether whats new was already shown in current session or not. </summary>
 		public bool WasShownInCurrentSession { get; set; }
 
 		/// <summary> Holds the information in which version of the app the whats new dialog has been shown.</summary>
@@ -736,10 +736,10 @@ namespace TINK.Model
 		/// <summary> Holds information whether whats new page was already shown or not.</summary>
 		public bool IsShowRequired { get; }
 
-		/// <summary> True if info about modified agb has to be displayed. </summary>
+		/// <summary> True if info about modified AGB has to be displayed. </summary>
 		public bool IsShowAgbRequired => (WasShownVersion ?? AGBMODIFIEDBUILD) < AGBMODIFIEDBUILD;
 
-		/// <summary> Get the whats new text depening of version gap.</summary>
+		/// <summary> Get the whats new text depending of version gap.</summary>
 		/// <param name="messages">Messages to process.</param>
 		public IDictionary<Version, string> WhatsNewText { get; }
 	}
diff --git a/TINKLib/MultilingualResources/AppResources.Designer.cs b/TINKLib/MultilingualResources/AppResources.Designer.cs
index 1f3363b..4b6d653 100644
--- a/TINKLib/MultilingualResources/AppResources.Designer.cs
+++ b/TINKLib/MultilingualResources/AppResources.Designer.cs
@@ -781,6 +781,18 @@ namespace TINK.MultilingualResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to - Bikes that must be returned to the starting station are marked as such with an icon and the station id.&lt;br/&gt;
+        ///- What used to be called &apos;return bike&apos; is now called &apos;end rental&apos;.  Always make sure to end your chargeable rental!&lt;br/&gt;
+        ///- Bug fixes&lt;br/&gt;
+        ///- Package updates.
+        /// </summary>
+        public static string ChangeLog_3_0_363_MK_SB {
+            get {
+                return ResourceManager.GetString("ChangeLog_3_0_363_MK_SB", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to We have fixed some bugs. Enjoy the ride!.
         /// </summary>
@@ -2406,6 +2418,15 @@ namespace TINK.MultilingualResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Circular drives only!.
+        /// </summary>
+        public static string MessageAaRideTypeInfoTitle {
+            get {
+                return ResourceManager.GetString("MessageAaRideTypeInfoTitle", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Log out.
         /// </summary>
@@ -2552,7 +2573,7 @@ namespace TINK.MultilingualResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Rental charges.
+        ///   Looks up a localized string similar to Rental costs.
         /// </summary>
         public static string MessageBikesManagementTariffDescriptionFeeEuroPerHour {
             get {
@@ -2579,7 +2600,7 @@ namespace TINK.MultilingualResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Max. charges.
+        ///   Looks up a localized string similar to Max. costs.
         /// </summary>
         public static string MessageBikesManagementTariffDescriptionMaxFeeEuroPerDay {
             get {
diff --git a/TINKLib/MultilingualResources/AppResources.de.resx b/TINKLib/MultilingualResources/AppResources.de.resx
index e38c8ef..9b616b1 100644
--- a/TINKLib/MultilingualResources/AppResources.de.resx
+++ b/TINKLib/MultilingualResources/AppResources.de.resx
@@ -475,7 +475,7 @@ Bitte App neu starten, um Radinfos zu bekommen.</value>
     <value>Gratis Nutzung</value>
   </data>
   <data name="MessageBikesManagementTariffDescriptionMaxFeeEuroPerDay" xml:space="preserve">
-    <value>Max. Gebühr</value>
+    <value>Max. Kosten</value>
   </data>
   <data name="MessageBikesManagementTariffDescriptionEuroPerHour" xml:space="preserve">
     <value>€/Std.</value>
@@ -1165,6 +1165,15 @@ Treten Sie an das Rad heran, schalten Sie Bluetooth und Standortdienste ein und
 &lt;br/&gt;
 Außerdem:&lt;br/&gt;
 - Kleinere Fehlerbehebungen&lt;br/&gt;
+- Paketaktualisierungen</value>
+  </data>
+  <data name="MessageAaRideTypeInfoTitle" xml:space="preserve">
+    <value>Nur Kreisfahrten!</value>
+  </data>
+  <data name="ChangeLog_3_0_363_MK_SB" xml:space="preserve">
+    <value>- Räder, die an der Startstation zurückgegeben werden müssen, sind als solche mit einem Symbol und der Stations-ID gekennzeichnet&lt;br/&gt;
+- Was früher als "Fahrrad zurückgeben" bezeichnet wurde, heißt jetzt "Miete beenden".  Vergewissern Sie sich immer, dass Sie Ihre kostenpflichtige Miete beenden!&lt;br/&gt;
+- Fehlerbehebungen&lt;br/&gt;
 - Paketaktualisierungen</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/TINKLib/MultilingualResources/AppResources.resx b/TINKLib/MultilingualResources/AppResources.resx
index 9e96c30..3887937 100644
--- a/TINKLib/MultilingualResources/AppResources.resx
+++ b/TINKLib/MultilingualResources/AppResources.resx
@@ -581,7 +581,7 @@ Please restart app in order to get bike info.</value>
     <value>€/hour</value>
   </data>
   <data name="MessageBikesManagementTariffDescriptionFeeEuroPerHour" xml:space="preserve">
-    <value>Rental charges</value>
+    <value>Rental costs</value>
   </data>
   <data name="MessageBikesManagementTariffDescriptionFreeTimePerSession" xml:space="preserve">
     <value>Free use</value>
@@ -590,7 +590,7 @@ Please restart app in order to get bike info.</value>
     <value>hour(s)/day</value>
   </data>
   <data name="MessageBikesManagementTariffDescriptionMaxFeeEuroPerDay" xml:space="preserve">
-    <value>Max. charges</value>
+    <value>Max. costs</value>
   </data>
   <data name="MessageBikesManagementTariffDescriptionTariffHeader" xml:space="preserve">
     <value>Tariff</value>
@@ -1254,6 +1254,15 @@ Approach the bike, turn on Bluetooth and Location services and try again.</value
 &lt;br/&gt;
 Also:&lt;br/&gt;
 - Minor bug fixes&lt;br/&gt;
+- Package updates</value>
+  </data>
+  <data name="MessageAaRideTypeInfoTitle" xml:space="preserve">
+    <value>Circular drives only!</value>
+  </data>
+  <data name="ChangeLog_3_0_363_MK_SB" xml:space="preserve">
+    <value>- Bikes that must be returned to the starting station are marked as such with an icon and the station id.&lt;br/&gt;
+- What used to be called 'return bike' is now called 'end rental'.  Always make sure to end your chargeable rental!&lt;br/&gt;
+- Bug fixes&lt;br/&gt;
 - Package updates</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/TINKLib/MultilingualResources/TINKLib.de.xlf b/TINKLib/MultilingualResources/TINKLib.de.xlf
index 0a1615a..d7b0850 100644
--- a/TINKLib/MultilingualResources/TINKLib.de.xlf
+++ b/TINKLib/MultilingualResources/TINKLib.de.xlf
@@ -20,8 +20,7 @@
         </trans-unit>
         <trans-unit id="ActionCloseAndReturn" translate="yes" xml:space="preserve">
           <source>Close lock &amp; end rental</source>
-          <target state="needs-review-translation">Schloss schließen &amp; Miete beenden</target>
-          <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
+          <target state="translated">Schloss schließen &amp; Miete beenden</target>
         </trans-unit>
         <trans-unit id="ActionOpen" translate="yes" xml:space="preserve">
           <source>Open lock</source>
@@ -41,8 +40,7 @@
         </trans-unit>
         <trans-unit id="ActionReturn" translate="yes" xml:space="preserve">
           <source>End rental</source>
-          <target state="needs-review-translation">Miete beenden</target>
-          <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
+          <target state="translated">Miete beenden</target>
         </trans-unit>
         <trans-unit id="MarkingMapPage" translate="yes" xml:space="preserve">
           <source>Bike Locations</source>
@@ -307,8 +305,7 @@ Bitte melden Sie sich erneut an.</target>
         </trans-unit>
         <trans-unit id="ActionLoginRegister" translate="yes" xml:space="preserve">
           <source>Register for free</source>
-          <target state="needs-review-translation">Kostenlos registrieren</target>
-          <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
+          <target state="translated">Kostenlos registrieren</target>
         </trans-unit>
         <trans-unit id="MarkingLoginEmailAddressLabel" translate="yes" xml:space="preserve">
           <source>E-mail</source>
@@ -628,16 +625,17 @@ Bitte App neu starten, um Radinfos zu bekommen.</target>
           <target state="translated">Abo-Preis</target>
         </trans-unit>
         <trans-unit id="MessageBikesManagementTariffDescriptionFeeEuroPerHour" translate="yes" xml:space="preserve">
-          <source>Rental charges</source>
+          <source>Rental costs</source>
           <target state="translated">Mietkosten</target>
+          <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
         </trans-unit>
         <trans-unit id="MessageBikesManagementTariffDescriptionFreeTimePerSession" translate="yes" xml:space="preserve">
           <source>Free use</source>
           <target state="translated">Gratis Nutzung</target>
         </trans-unit>
         <trans-unit id="MessageBikesManagementTariffDescriptionMaxFeeEuroPerDay" translate="yes" xml:space="preserve">
-          <source>Max. charges</source>
-          <target state="needs-review-translation">Max. Gebühr</target>
+          <source>Max. costs</source>
+          <target state="translated">Max. Kosten</target>
           <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
         </trans-unit>
         <trans-unit id="MessageBikesManagementTariffDescriptionEuroPerHour" translate="yes" xml:space="preserve">
@@ -729,7 +727,7 @@ Bitte kontaktieren sie den Betreiber!</target>
         </trans-unit>
         <trans-unit id="ChangeLog3_0_227" translate="yes" xml:space="preserve">
           <source>Feedback dialog added which is shown after ending rental.</source>
-          <target state="needs-review-translation">Seite zur Eingabe von Rückmeldungen hinzugefügt, der nach Rückgabe eines Rads angezeigt wird.</target>
+          <target state="translated">Seite zur Eingabe von Rückmeldungen hinzugefügt, der nach Rückgabe eines Rads angezeigt wird.</target>
           <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
         </trans-unit>
         <trans-unit id="ActivityTextConnectionStateOffline" translate="yes" xml:space="preserve">
@@ -784,7 +782,7 @@ Layout Anzeige Radnamen und nummern verbessert.</target>
         </trans-unit>
         <trans-unit id="ChangeLog3_0_237" translate="yes" xml:space="preserve">
           <source>Hard- and software information send to backend when ending rental.</source>
-          <target state="needs-review-translation">Hard- und software information werden an Backend übermittelt bei Radrückgabe.</target>
+          <target state="translated">Hard- und software information werden an Backend übermittelt bei Radrückgabe.</target>
           <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
         </trans-unit>
         <trans-unit id="ChangeLog3_0_239" translate="yes" xml:space="preserve">
@@ -875,8 +873,7 @@ Kleinere Verbesserungen.</target>
         </trans-unit>
         <trans-unit id="MessageErrorQueryLocationTitle" translate="yes" xml:space="preserve">
           <source>Error query location!</source>
-          <target state="needs-review-translation">Fehler bei Standortabfrage!</target>
-          <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
+          <target state="translated">Fehler bei Standortabfrage!</target>
         </trans-unit>
         <trans-unit id="MessageErrorQueryLocationMessage" translate="yes" xml:space="preserve">
           <source>Closing the lock and ending the rental is not possible.</source>
@@ -884,7 +881,7 @@ Kleinere Verbesserungen.</target>
         </trans-unit>
         <trans-unit id="MessageErrorQueryLocationStartTitle" translate="yes" xml:space="preserve">
           <source>Error start query location!</source>
-          <target state="needs-review-translation">Fehler beim Start der Standortabfrage!</target>
+          <target state="translated">Fehler beim Start der Standortabfrage!</target>
           <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
         </trans-unit>
         <trans-unit id="ActivityTextErrorQueryLocationWhenAny" translate="yes" xml:space="preserve">
@@ -1239,12 +1236,12 @@ Kleinere Fehlerbehebungen.
         </trans-unit>
         <trans-unit id="ActionContactMailAppReleated" translate="yes" xml:space="preserve">
           <source>Feedback about the app</source>
-          <target state="needs-review-translation">Rückmeldung zur App</target>
+          <target state="translated">Rückmeldung zur App</target>
           <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
         </trans-unit>
         <trans-unit id="MiscContactMailAppReleatedSubject" translate="yes" xml:space="preserve">
           <source>{0}-app releated request</source>
-          <target state="needs-review-translation">{0}-App Anfrage</target>
+          <target state="translated">{0}-App Anfrage</target>
           <note from="MultilingualBuild" annotates="source" priority="2">Subject of contact mail to ("Feedback about the app").</note>
           <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
         </trans-unit>
@@ -1567,7 +1564,7 @@ Wichtig: Schicken Sie eine E-Mail an den Betreiber (ansonsten läuft Ihre kosten
         </trans-unit>
         <trans-unit id="MarkingNoNetworkConnection" translate="yes" xml:space="preserve">
           <source>Oops, there is no Internet connection.</source>
-          <target state="needs-review-translation">Ups, es ist keine Internetverbindung vorhanden.</target>
+          <target state="translated">Ups, es ist keine Internetverbindung vorhanden.</target>
           <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
         </trans-unit>
         <trans-unit id="ChangeLog_3_0_358_MK_SB" translate="yes" xml:space="preserve">
@@ -1614,6 +1611,21 @@ Also:&lt;br/&gt;
 &lt;br/&gt;
 Außerdem:&lt;br/&gt;
 - Kleinere Fehlerbehebungen&lt;br/&gt;
+- Paketaktualisierungen</target>
+        </trans-unit>
+        <trans-unit id="MessageAaRideTypeInfoTitle" translate="yes" xml:space="preserve">
+          <source>Circular drives only!</source>
+          <target state="translated">Nur Kreisfahrten!</target>
+          <note from="MultilingualUpdate" annotates="source" priority="2">Please verify the translation’s accuracy as the source string was updated after it was translated.</note>
+        </trans-unit>
+        <trans-unit id="ChangeLog_3_0_363_MK_SB" translate="yes" xml:space="preserve">
+          <source>- Bikes that must be returned to the starting station are marked as such with an icon and the station id.&lt;br/&gt;
+- What used to be called 'return bike' is now called 'end rental'.  Always make sure to end your chargeable rental!&lt;br/&gt;
+- Bug fixes&lt;br/&gt;
+- Package updates</source>
+          <target state="translated">- Räder, die an der Startstation zurückgegeben werden müssen, sind als solche mit einem Symbol und der Stations-ID gekennzeichnet&lt;br/&gt;
+- Was früher als "Fahrrad zurückgeben" bezeichnet wurde, heißt jetzt "Miete beenden".  Vergewissern Sie sich immer, dass Sie Ihre kostenpflichtige Miete beenden!&lt;br/&gt;
+- Fehlerbehebungen&lt;br/&gt;
 - Paketaktualisierungen</target>
         </trans-unit>
       </group>
diff --git a/TINKLib/Repository/CopriCallsHttps.cs b/TINKLib/Repository/CopriCallsHttps.cs
index ea1ff0b..7500ef0 100644
--- a/TINKLib/Repository/CopriCallsHttps.cs
+++ b/TINKLib/Repository/CopriCallsHttps.cs
@@ -13,6 +13,7 @@ using TINK.Model.Logging;
 using TINK.Repository.Exception;
 using TINK.Repository.Request;
 using TINK.Repository.Response;
+using TINK.Repository.Response.Stations;
 
 namespace TINK.Repository
 {
@@ -24,7 +25,7 @@ namespace TINK.Repository
 
 		/// <summary> Initializes a instance of the copri calls https object. </summary>
 		/// <param name="copriHost">Host to connect to. </param>
-		/// <param name="appContextInfo">Provides app related info (app name and version, merchantid) to pass to COPRI.</param>
+		/// <param name="appContextInfo">Provides app related info (app name and version, merchant id) to pass to COPRI.</param>
 		/// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
 		/// <param name="smartDevice">Holds info about smart device.</param>
 		/// <param name="sessionCookie">Session cookie if user is logged in, null otherwise.</param>
@@ -50,7 +51,7 @@ namespace TINK.Repository
 		/// <summary> Holds the URL for rest calls.</summary>
 		private Uri m_oCopriHost;
 
-		/// <summary> Spacifies name and version of app. </summary>
+		/// <summary> Specifies name and version of app. </summary>
 		private string UserAgent { get; }
 
 		/// <summary> Returns true because value requested form copri server are returned. </summary>
@@ -63,7 +64,7 @@ namespace TINK.Repository
 		public string SessionCookie => requestBuilder.SessionCookie;
 
 		/// <summary> Logs user in. </summary>
-		/// <param name="mailAddress">Mailaddress of user to log in.</param>
+		/// <param name="mailAddress">Mail address of user to log in.</param>
 		/// <param name="password">Password to log in.</param>
 		/// <param name="deviceId">Id specifying user and hardware.</param>
 		/// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
@@ -87,7 +88,7 @@ namespace TINK.Repository
 		public async Task<BikesAvailableResponse> GetBikesAvailableAsync()
 			=> await GetBikesAvailableAsync(m_oCopriHost.AbsoluteUri, requestBuilder.GetBikesAvailable(), UserAgent);
 
-		/// <summary> Gets a list of bikes reserved/ booked by acctive user. </summary>
+		/// <summary> Gets a list of bikes reserved/ booked by active user. </summary>
 		/// <returns>Response holding list of bikes.</returns>
 		public async Task<BikesReservedOccupiedResponse> GetBikesOccupiedAsync()
 		{
@@ -127,7 +128,7 @@ namespace TINK.Repository
 				requestBuilder.DoReserve(bikeId),
 				UserAgent);
 
-		/// <summary> Gets canel booking request response.</summary>
+		/// <summary> Gets cancel booking request response.</summary>
 		/// <param name="bikeId">Id of the bike to book.</param>
 		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
 		/// <returns>Response on cancel booking request.</returns>
@@ -183,13 +184,13 @@ namespace TINK.Repository
 					requestBuilder.UpateLockingState(bikeId, state, location, batteryLevel, versionInfo),
 					UserAgent);
 
-		/// <summary> Gets booking request request. </summary>
+		/// <summary> Gets booking request. </summary>
 		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
 		/// <param name="bikeId">Id of the bike to book.</param>
 		/// <param name="guid">Used to publish GUID from app to copri. Used for initial setup of bike in copri.</param>
 		/// <param name="batteryPercentage">Holds the filling level percentage of the battery.</param>
 		/// <param name="nextAction">If not null next locking action which is performed after booking.</param>
-		/// <returns>Requst on booking request.</returns>
+		/// <returns>Request on booking request.</returns>
 		public async Task<ReservationBookingResponse> DoBookAsync(
 			Uri operatorUri,
 			string bikeId,
@@ -296,7 +297,7 @@ namespace TINK.Repository
 					copriHost,
 					command,
 					userAgent,
-					displayCommand); // Do not include password into exception output when an error occurres.
+					displayCommand); // Do not include password into exception output when an error occurs.
 			}
 			catch (System.Exception l_oException)
 			{
@@ -437,7 +438,7 @@ namespace TINK.Repository
 #endif
 		}
 
-		/// <summary> Gets a list of bikes reserved/ booked by acctive user from Copri.</summary>
+		/// <summary> Gets a list of bikes reserved/ booked by active user from Copri.</summary>
 		/// <param name="copriHost">URL of the copri host to connect to.</param>
 		/// <param name="command">Command to post.</param>
 		/// <returns>Response holding list of bikes.</returns>
@@ -785,8 +786,8 @@ namespace TINK.Repository
 #endif
 		}
 
-		/// <summary> http get- request.</summary>
-		/// <param name="Url">Ulr to get info from.</param>
+		/// <summary> Https get- request.</summary>
+		/// <param name="Url">Url to get info from.</param>
 		/// <returns>response from server</returns>
 		public static async Task<string> Get(string Url)
 		{
@@ -804,7 +805,7 @@ namespace TINK.Repository
 			return result;
 		}
 
-		/// <summary> http- post request.</summary>
+		/// <summary> Https- post request.</summary>
 		/// <param name="command">Command to send.</param>
 		/// <param name="displayCommand">Command to display/ log used for error handling.</param>
 		/// <param name="uRL">Address of server to communicate with.</param>
@@ -838,7 +839,7 @@ namespace TINK.Repository
 #if !WINDOWS_UWP
 				var l_strHost = uRL;
 
-				// Returns a http request.
+				// Returns a https request.
 				var request = WebRequest.CreateHttp(l_strHost);
 
 				request.Method = "POST";
diff --git a/TINKLib/Repository/CopriCallsMemory.cs b/TINKLib/Repository/CopriCallsMemory.cs
index 6f58000..84efb4a 100644
--- a/TINKLib/Repository/CopriCallsMemory.cs
+++ b/TINKLib/Repository/CopriCallsMemory.cs
@@ -5,12 +5,13 @@ using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
 using TINK.Model.Connector;
 using TINK.Repository.Request;
 using TINK.Repository.Response;
+using TINK.Repository.Response.Stations;
 
 namespace TINK.Repository
 {
-    public class CopriCallsMemory : ICopriServer
+	public class CopriCallsMemory : ICopriServer
     {
-        /// <summary> Part in file specifying apiserver.</summary>
+        /// <summary> Part in file specifying api server.</summary>
         private static string CopriDevelHostUri = @"https://tinkwwp.copri-bike.de/APIjsonserver";
 
         public const string DO_AUTH_Unknown_User_FILE = @"
@@ -1335,7 +1336,7 @@ namespace TINK.Repository
         }
 
         /// <summary>
-        /// Gets a list of bikes reserved/ booked by acctive user from Copri.
+        /// Gets a list of bikes reserved/ booked by active user from Copri.
         /// </summary>
         /// <param name="p_strSessionCookie">Cookie to authenticate user.</param>
         /// <returns>Response holding list of bikes.</returns>
@@ -1343,7 +1344,7 @@ namespace TINK.Repository
         {
             try
             {
-                requestBuilder.GetBikesOccupied(); // Non mock implementation if ICopriServer call this member as well. To ensure comparable behaviour this member is called here as well.
+                requestBuilder.GetBikesOccupied(); // Non mock implementation if ICopriServer call this member as well. To ensure comparable behavior this member is called here as well.
             }
             catch (NotSupportedException)
             {
@@ -1673,7 +1674,7 @@ namespace TINK.Repository
             => null;
 
         /// <summary>
-        /// Gets a list of bikes reserved/ booked by acctive user from Copri.
+        /// Gets a list of bikes reserved/ booked by active user from Copri.
         /// </summary>
         /// <param name="sessionCookie">Cookie to authenticate user.</param>
         /// <param name="SampleSet">Sample set to use.</param>
diff --git a/TINKLib/Repository/CopriCallsMonkeyStore.cs b/TINKLib/Repository/CopriCallsMonkeyStore.cs
index 592821b..a3d3e90 100644
--- a/TINKLib/Repository/CopriCallsMonkeyStore.cs
+++ b/TINKLib/Repository/CopriCallsMonkeyStore.cs
@@ -8,6 +8,7 @@ using TINK.Model.Device;
 using TINK.Model.Services.CopriApi;
 using TINK.Repository.Request;
 using TINK.Repository.Response;
+using TINK.Repository.Response.Stations;
 
 namespace TINK.Repository
 {
diff --git a/TINKLib/Repository/ICopriServer.cs b/TINKLib/Repository/ICopriServer.cs
index b389801..4b61d22 100644
--- a/TINKLib/Repository/ICopriServer.cs
+++ b/TINKLib/Repository/ICopriServer.cs
@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
 using TINK.Model.Connector;
-using TINK.Model.Device;
 using TINK.Repository.Request;
 using TINK.Repository.Response;
+using TINK.Repository.Response.Stations;
 
 namespace TINK.Repository
 {
@@ -13,7 +13,7 @@ namespace TINK.Repository
 	public interface ICopriServerBase
 	{
 		/// <summary> Logs user in. </summary>
-		/// <param name="mailAddress">Mailaddress of user to log in.</param>
+		/// <param name="mailAddress">Mail address of user to log in.</param>
 		/// <param name="password">Password to log in.</param>
 		/// <param name="deviceId">Id specifying user and hardware.</param>
 		/// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
@@ -34,7 +34,7 @@ namespace TINK.Repository
 			string bikeId,
 			Uri operatorUri);
 
-		/// <summary> Cancels reservation of bik. </summary>
+		/// <summary> Cancels reservation of bike. </summary>
 		/// <param name="bikeId">Id of the bike to reserve.</param>
 		/// <param name="operatorUri">Holds the uri of the operator or null, in case of single operator setup.</param>
 		/// <returns>Response on cancel reservation request.</returns>
@@ -162,7 +162,7 @@ namespace TINK.Repository
 		/// <returns>Response holding list of bikes.</returns>
 		Task<BikesAvailableResponse> GetBikesAvailableAsync();
 
-		/// <summary> Gets a list of bikes reserved/ booked by acctive user from Copri.</summary>
+		/// <summary> Gets a list of bikes reserved/ booked by active user from Copri.</summary>
 		/// <returns>Response holding list of bikes.</returns>
 		Task<BikesReservedOccupiedResponse> GetBikesOccupiedAsync();
 	}
diff --git a/TINKLib/Repository/Request/IRequestBuilder.cs b/TINKLib/Repository/Request/IRequestBuilder.cs
index f8af57e..a9878dd 100644
--- a/TINKLib/Repository/Request/IRequestBuilder.cs
+++ b/TINKLib/Repository/Request/IRequestBuilder.cs
@@ -15,10 +15,10 @@ namespace TINK.Repository.Request
 		string SessionCookie { get; }
 
 		/// <summary> Gets request to log user in. </summary>
-		/// <param name="mailAddress">Mailaddress of user to log in.</param>
+		/// <param name="mailAddress">Mail address of user to log in.</param>
 		/// <param name="password">Password to log in.</param>
 		/// <param name="deviceId">Id specifying user and hardware.</param>
-		/// <remarks>Requst which holds auth cookie <see cref="RequstBase.authcookie"/></remarks>
+		/// <remarks>Request which holds auth cookie <see cref="RequstBase.authcookie"/></remarks>
 		string DoAuthorization(
 			string mailAddress,
 			string password,
@@ -37,7 +37,7 @@ namespace TINK.Repository.Request
 		/// <returns>Request to query list of bikes available.</returns>
 		string GetBikesAvailable();
 
-		/// <summary> Gets a list of bikes reserved/ booked by acctive user from Copri.</summary>
+		/// <summary> Gets a list of bikes reserved/ booked by active user from Copri.</summary>
 		/// <returns>Request to query list of bikes occupied.</returns>
 		string GetBikesOccupied();
 
diff --git a/TINKLib/Repository/Request/RequestBuilder.cs b/TINKLib/Repository/Request/RequestBuilder.cs
index 7318fee..ca2d831 100644
--- a/TINKLib/Repository/Request/RequestBuilder.cs
+++ b/TINKLib/Repository/Request/RequestBuilder.cs
@@ -81,7 +81,7 @@ namespace TINK.Repository.Request
 			SmartDevice.GetSmartDeviceParameters() +
 			UiIsoLanguageNameParameter;
 
-		/// <summary> Gets a list of bikes reserved/ booked by acctive user from Copri.</summary>
+		/// <summary> Gets a list of bikes reserved/ booked by active user from Copri.</summary>
 		/// <returns>Request to query list of bikes occupied.</returns>
 		public string GetBikesOccupied()
 			=> throw new NotSupportedException();
diff --git a/TINKLib/Repository/Request/RequestBuilderLoggedIn.cs b/TINKLib/Repository/Request/RequestBuilderLoggedIn.cs
index 65b38b8..6d948f6 100644
--- a/TINKLib/Repository/Request/RequestBuilderLoggedIn.cs
+++ b/TINKLib/Repository/Request/RequestBuilderLoggedIn.cs
@@ -78,7 +78,7 @@ namespace TINK.Repository.Request
 				AuthCookieParameter +
 				UiIsoLanguageNameParameter;
 
-		/// <summary> Gets a list of bikes reserved/ booked by acctive user from Copri.</summary>
+		/// <summary> Gets a list of bikes reserved/ booked by active user from Copri.</summary>
 		/// <returns>Request to query list of bikes occupied.</returns>
 		public string GetBikesOccupied()
 			=> "request=user_bikes_occupied&system=all&genkey=1" +
diff --git a/TINKLib/Repository/Response/BikeInfoBase.cs b/TINKLib/Repository/Response/BikeInfoBase.cs
index 745cf56..aa068eb 100644
--- a/TINKLib/Repository/Response/BikeInfoBase.cs
+++ b/TINKLib/Repository/Response/BikeInfoBase.cs
@@ -1,4 +1,4 @@
-using System.Runtime.Serialization;
+using System.Runtime.Serialization;
 
 namespace TINK.Repository.Response
 {
@@ -27,7 +27,7 @@ namespace TINK.Repository.Response
 		public string station { get; private set; }
 
 		/// <summary>
-		/// Holds the localized (german) description of the bike.
+		/// Holds the localized (German) description of the bike.
 		/// </summary>
 		[DataMember]
 		public string description { get; private set; }
@@ -78,6 +78,12 @@ namespace TINK.Repository.Response
 		/// <summary> Describes type of the bike.</summary>
 		public BikeType bike_type { get; private set; }
 
+		/// <summary>
+		/// Holds whether bike is a AA bike (bike must be always returned a the same station) or AB bike (start and end stations can be different stations).
+		/// </summary>
+		[DataMember]
+		public string aa_ride { get; private set; }
+
 		/// <summary> Loading state of motor battery in % ]0..100[. </summary>
 		[DataMember]
 		public string bike_charge { get; private set; }
diff --git a/TINKLib/Repository/Response/BikeType.cs b/TINKLib/Repository/Response/BikeType.cs
index 4bef5b2..8017922 100644
--- a/TINKLib/Repository/Response/BikeType.cs
+++ b/TINKLib/Repository/Response/BikeType.cs
@@ -1,4 +1,4 @@
-using System.Runtime.Serialization;
+using System.Runtime.Serialization;
 
 namespace TINK.Repository.Response
 {
@@ -40,7 +40,7 @@ namespace TINK.Repository.Response
 			public string charge_current_percent { get; private set; }
 
 			/// <summary>
-			/// Holds the maximum chargeing level of the battery in bars.
+			/// Holds the maximum charging level of the battery in bars.
 			/// </summary>
 			[DataMember]
 			public string charge_max_bars { get; private set; }
diff --git a/TINKLib/Repository/Response/ResponseHelper.cs b/TINKLib/Repository/Response/ResponseHelper.cs
index b9071a9..cd44a8a 100644
--- a/TINKLib/Repository/Response/ResponseHelper.cs
+++ b/TINKLib/Repository/Response/ResponseHelper.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using TINK.MultilingualResources;
 using TINK.Repository.Exception;
 
@@ -80,7 +80,7 @@ namespace TINK.Repository.Response
 
 		/// <summary>Gets if a call to reserve bike succeeded or not by checking a booking response.</summary>
 		/// <param name="bikeId">Id of bike which should be booked.</param>
-		/// <param name="sessionCookie">Sessiong cookie of logged in user.</param>
+		/// <param name="sessionCookie">Session cookie of logged in user.</param>
 		/// <param name="bookingResponse">Response to check.</param>
 		/// <returns></returns>
 		public static BikeInfoReservedOrBooked GetIsReserveResponseOk(
diff --git a/TINKLib/Repository/Response/Stations/Station/OperatorData.cs b/TINKLib/Repository/Response/Stations/Station/OperatorData.cs
new file mode 100644
index 0000000..ce90694
--- /dev/null
+++ b/TINKLib/Repository/Response/Stations/Station/OperatorData.cs
@@ -0,0 +1,27 @@
+using System.Runtime.Serialization;
+
+namespace TINK.Repository.Response.Stations.Station
+{
+	/// <summary>
+	/// Holds info about operator data.
+	/// </summary>
+	[DataContract]
+	public class OperatorData
+	{
+		[DataMember]
+		public string operator_name { get; private set; }
+
+		[DataMember]
+		public string operator_phone { get; private set; }
+
+		[DataMember]
+		public string operator_hours { get; private set; }
+
+		[DataMember]
+		public string operator_email { get; private set; }
+
+
+		[DataMember]
+		public string operator_color { get; private set; }
+	}
+}
diff --git a/TINKLib/Repository/Response/Stations/Station/StationInfo.cs b/TINKLib/Repository/Response/Stations/Station/StationInfo.cs
new file mode 100644
index 0000000..d727420
--- /dev/null
+++ b/TINKLib/Repository/Response/Stations/Station/StationInfo.cs
@@ -0,0 +1,32 @@
+using System.Runtime.Serialization;
+
+namespace TINK.Repository.Response.Stations.Station
+{
+	/// <summary>
+	/// Holds info about a single station.
+	/// </summary>
+	[DataContract]
+	public class StationInfo
+	{
+		/// <summary>
+		/// Unique id of the station.
+		/// </summary>
+		[DataMember]
+		public string station { get; private set; }
+
+		[DataMember]
+		public string[] station_group { get; private set; }
+
+		[DataMember]
+		public string description { get; private set; }
+
+		/// <summary>
+		/// Position of the station.
+		/// </summary>
+		[DataMember]
+		public Position gps { get; private set; }
+
+		[DataMember]
+		public OperatorData operator_data { get; private set; }
+	}
+}
diff --git a/TINKLib/Repository/Response/Stations/StationsAvailableResponse.cs b/TINKLib/Repository/Response/Stations/StationsAvailableResponse.cs
new file mode 100644
index 0000000..8d4e12f
--- /dev/null
+++ b/TINKLib/Repository/Response/Stations/StationsAvailableResponse.cs
@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using TINK.Repository.Response.Stations.Station;
+
+namespace TINK.Repository.Response.Stations
+{
+	/// <summary>
+	/// Holds the information about all stations and is used for deserialization of copri answer.
+	/// </summary>
+	[DataContract]
+	public class StationsAvailableResponse : ResponseBase
+	{
+		/// <summary>
+		/// Dictionary of bikes.
+		/// </summary>
+		[DataMember]
+		public Dictionary<string, StationInfo> stations { get; private set; }
+	}
+}
diff --git a/TINKLib/Repository/Response/StationsAvailableResponse.cs b/TINKLib/Repository/Response/StationsAvailableResponse.cs
deleted file mode 100644
index 18db861..0000000
--- a/TINKLib/Repository/Response/StationsAvailableResponse.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System.Collections.Generic;
-using System.Runtime.Serialization;
-
-namespace TINK.Repository.Response
-{
-	/// <summary>
-	/// Holds the information about all stations and is used for deserialization of copri answer.
-	/// </summary>
-	[DataContract]
-	public class StationsAvailableResponse : ResponseBase
-	{
-		/// <summary>
-		/// Holds info about a single station.
-		/// </summary>
-		[DataContract]
-		public class StationInfo
-		{
-			/// <summary>
-			/// Holds info about opertor data.
-			/// </summary>
-			[DataContract]
-			public class OperatorData
-			{
-				[DataMember]
-				public string operator_name { get; private set; }
-
-				[DataMember]
-				public string operator_phone { get; private set; }
-
-				[DataMember]
-				public string operator_hours { get; private set; }
-
-				[DataMember]
-				public string operator_email { get; private set; }
-
-
-				[DataMember]
-				public string operator_color { get; private set; }
-			}
-
-			/// <summary>
-			/// Unique id of the station.
-			/// </summary>
-			[DataMember]
-			public string station { get; private set; }
-
-			[DataMember]
-			public string[] station_group { get; private set; }
-
-			[DataMember]
-			public string description { get; private set; }
-
-			/// <summary>
-			/// Position of the station.
-			/// </summary>
-			[DataMember]
-			public Position gps { get; private set; }
-
-			[DataMember]
-			public OperatorData operator_data { get; private set; }
-		}
-
-		/// <summary>
-		/// Dictionary of bikes.
-		/// </summary>
-		[DataMember]
-		public Dictionary<string, StationInfo> stations { get; private set; }
-	}
-}
diff --git a/TINKLib/Services/BluetoothLock/LocksServiceInReach.cs b/TINKLib/Services/BluetoothLock/LocksServiceInReach.cs
index 173732b..abf3eae 100644
--- a/TINKLib/Services/BluetoothLock/LocksServiceInReach.cs
+++ b/TINKLib/Services/BluetoothLock/LocksServiceInReach.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -10,13 +10,13 @@ using TINK.Services.BluetoothLock.Tdo;
 namespace TINK.Services.BluetoothLock
 {
 	/// <summary>
-	/// Facke locks service implementation which simulates locks which are in reach.
+	/// Fake locks service implementation which simulates locks which are in reach.
 	/// </summary>
 	public class LocksServiceInReach : ILocksServiceFake
 	{
 		private IEnumerable<LockInfoTdo> LocksInfo { get; set; } = new List<LockInfoTdo>();
 
-		/// <summary> Holds timeout values for series of connecting attemps to a lock or multiple locks. </summary>
+		/// <summary> Holds timeout values for series of connecting attempts to a lock or multiple locks. </summary>
 		public ITimeOutProvider TimeOut { get; set; }
 
 		/// <summary> Connects to lock.</summary>
@@ -45,7 +45,7 @@ namespace TINK.Services.BluetoothLock
 				switch (bikeInfo.State.Value)
 				{
 					case InUseStateEnum.Disposable:
-					case InUseStateEnum.FeedbackPending:    // State feedback pending does not exist for bluetooth locks but maches from bluetooth perspective state disposable.
+					case InUseStateEnum.FeedbackPending:    // State feedback pending does not exist for bluetooth locks but matches from bluetooth perspective state disposable.
 						switch (lockInfo.State)
 						{
 							case LockingState.Open:
diff --git a/TINKLib/Services/BluetoothLock/LocksServiceOutOfReach.cs b/TINKLib/Services/BluetoothLock/LocksServiceOutOfReach.cs
index 4461180..57e2855 100644
--- a/TINKLib/Services/BluetoothLock/LocksServiceOutOfReach.cs
+++ b/TINKLib/Services/BluetoothLock/LocksServiceOutOfReach.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -9,13 +9,13 @@ using TINK.Services.BluetoothLock.Tdo;
 namespace TINK.Services.BluetoothLock
 {
 	/// <summary>
-	/// Facke locks service implementation which simulates locks which are out of reach.
+	/// Fake locks service implementation which simulates locks which are out of reach.
 	/// </summary>
 	public class LocksServiceOutOfReach : ILocksServiceFake
 	{
 		private IEnumerable<LockInfoTdo> LocksInfo { get; set; } = new List<LockInfoTdo>();
 
-		/// <summary> Holds timeout values for series of connecting attemps to a lock or multiple locks. </summary>
+		/// <summary> Holds timeout values for series of connecting attempts to a lock or multiple locks. </summary>
 		public ITimeOutProvider TimeOut { get; set; }
 
 		/// <summary> Connects to lock.</summary>
@@ -26,7 +26,7 @@ namespace TINK.Services.BluetoothLock
 			return await Task.FromResult(new LockInfoTdo.Builder { Id = authInfo.Id, Guid = authInfo.Guid, State = null }.Build());
 		}
 
-		/// <summary> No info availalbe because no lock is in reach.</summary>
+		/// <summary> No info centered because no lock is in reach.</summary>
 		/// <param name="connectTimeout">Timeout for connect operation of a single lock.</param>
 		/// <returns>Empty collection.</returns>
 		public async Task<IEnumerable<LockInfoTdo>> GetLocksStateAsync(IEnumerable<LockInfoAuthTdo> locksInfo, TimeSpan connectTimeout) => await Task.FromResult(LocksInfo);
diff --git a/TINKLib/Services/CopriApi/CopriProviderHttps.cs b/TINKLib/Services/CopriApi/CopriProviderHttps.cs
index 784472e..ce265a1 100644
--- a/TINKLib/Services/CopriApi/CopriProviderHttps.cs
+++ b/TINKLib/Services/CopriApi/CopriProviderHttps.cs
@@ -9,6 +9,7 @@ using TINK.Model.Device;
 using TINK.Repository;
 using TINK.Repository.Request;
 using TINK.Repository.Response;
+using TINK.Repository.Response.Stations;
 
 namespace TINK.Model.Services.CopriApi
 {
@@ -18,7 +19,7 @@ namespace TINK.Model.Services.CopriApi
 		/// <summary> Object which manages stored copri answers. </summary>
 		private ICopriCache CacheServer { get; }
 
-		/// <summary> Communicates whith copri server. </summary>
+		/// <summary> Communicates with copri server. </summary>
 		private ICopriServer HttpsServer { get; }
 
 		/// <summary> True if connector has access to copri server, false if cached values are used. </summary>
@@ -30,9 +31,9 @@ namespace TINK.Model.Services.CopriApi
 		/// <summary> Gets the merchant id.</summary>
 		public string MerchantId => HttpsServer.MerchantId;
 
-		/// <summary> Constructs copri provider object to connet to https using a cache objet. </summary>
+		/// <summary> Constructs copri provider object to connect to https using a cache object. </summary>
 		/// <param name="copriHost"></param>
-		/// <param name="appContextInfo">Provides app related info (app name and version, merchantid) to pass to COPRI.</param>
+		/// <param name="appContextInfo">Provides app related info (app name and version, merchant id) to pass to COPRI.</param>
 		/// <param name="uiIsoLangugageName">Two letter ISO language name.</param>
 		/// <param name="smartDevice">Holds info about smart device.</param>
 		/// <param name="sessionCookie">Cookie of user if a user is logged in, false otherwise.</param>
@@ -68,7 +69,7 @@ namespace TINK.Model.Services.CopriApi
 
 			try
 			{
-				Log.ForContext<CopriProviderHttps>().Debug($"Querrying bikes available from copri.");
+				Log.ForContext<CopriProviderHttps>().Debug($"Querying bikes available from copri.");
 				var bikesAvailableResponse = await HttpsServer.GetBikesAvailableAsync();
 				return new Result<BikesAvailableResponse>(
 					typeof(CopriCallsHttps),
@@ -78,13 +79,13 @@ namespace TINK.Model.Services.CopriApi
 			catch (Exception exception)
 			{
 				// Return response from cache.
-				Log.ForContext<CopriProviderHttps>().Debug("An error occurred querrying bikes available. {Exception}.", exception);
+				Log.ForContext<CopriProviderHttps>().Debug("An error occurred querying bikes available. {Exception}.", exception);
 				var bikesAvailableResponse = await CacheServer.GetBikesAvailableAsync();
 				return new Result<BikesAvailableResponse>(typeof(CopriCallsMonkeyStore), bikesAvailableResponse, bikesAvailableResponse.GetGeneralData(), exception);
 			}
 		}
 
-		/// <summary> Gets a list of bikes reserved/ booked by acctive user. </summary>
+		/// <summary> Gets a list of bikes reserved/ booked by active user. </summary>
 		/// <param name="sessionCookie">Cookie to authenticate user.</param>
 		/// <returns>Response holding list of bikes.</returns>
 		public async Task<Result<BikesReservedOccupiedResponse>> GetBikesOccupied(bool fromCache = false)
@@ -101,7 +102,7 @@ namespace TINK.Model.Services.CopriApi
 
 			try
 			{
-				Log.ForContext<CopriProviderHttps>().Debug($"Querrying bikes occupied from copri.");
+				Log.ForContext<CopriProviderHttps>().Debug($"Querying bikes occupied from copri.");
 				var bikesOccupiedResponse = await HttpsServer.GetBikesOccupiedAsync();
 				return new Result<BikesReservedOccupiedResponse>(
 					typeof(CopriCallsHttps),
@@ -112,7 +113,7 @@ namespace TINK.Model.Services.CopriApi
 			catch (Exception exception)
 			{
 				// Return response from cache.
-				Log.ForContext<CopriProviderHttps>().Debug("An error occurred querrying bikes occupied. {Exception}.", exception);
+				Log.ForContext<CopriProviderHttps>().Debug("An error occurred querying bikes occupied. {Exception}.", exception);
 				var bikesOccupiedResponse = await CacheServer.GetBikesOccupiedAsync();
 				return new Result<BikesReservedOccupiedResponse>(typeof(CopriCallsMonkeyStore), bikesOccupiedResponse, bikesOccupiedResponse.GetGeneralData(), exception);
 			}
@@ -134,7 +135,7 @@ namespace TINK.Model.Services.CopriApi
 
 			try
 			{
-				Log.ForContext<CopriProviderHttps>().Debug($"Querrying stations from copri.");
+				Log.ForContext<CopriProviderHttps>().Debug($"Querying stations from copri.");
 
 				var stations = await HttpsServer.GetStationsAsync();
 
@@ -146,7 +147,7 @@ namespace TINK.Model.Services.CopriApi
 			catch (Exception exception)
 			{
 				// Return response from cache.
-				Log.ForContext<CopriProviderHttps>().Debug("An error occurred querrying stations. {Exception}.", exception);
+				Log.ForContext<CopriProviderHttps>().Debug("An error occurred querying stations. {Exception}.", exception);
 				var stationsResponse = await CacheServer.GetStationsAsync();
 				return new Result<StationsAvailableResponse>(typeof(CopriCallsMonkeyStore), stationsResponse, stationsResponse.GetGeneralData(), exception);
 			}
diff --git a/TINKLib/Services/CopriApi/CopriProviderMonkeyStore.cs b/TINKLib/Services/CopriApi/CopriProviderMonkeyStore.cs
index 3085e64..2961e2a 100644
--- a/TINKLib/Services/CopriApi/CopriProviderMonkeyStore.cs
+++ b/TINKLib/Services/CopriApi/CopriProviderMonkeyStore.cs
@@ -7,6 +7,7 @@ using TINK.Model.Device;
 using TINK.Repository;
 using TINK.Repository.Request;
 using TINK.Repository.Response;
+using TINK.Repository.Response.Stations;
 using TINK.Services.CopriApi.Exception;
 
 namespace TINK.Model.Services.CopriApi
diff --git a/TINKLib/Services/CopriApi/ICachedCopriServer.cs b/TINKLib/Services/CopriApi/ICachedCopriServer.cs
index 8659714..046e7ed 100644
--- a/TINKLib/Services/CopriApi/ICachedCopriServer.cs
+++ b/TINKLib/Services/CopriApi/ICachedCopriServer.cs
@@ -1,7 +1,8 @@
-
+
 using System.Threading.Tasks;
 using TINK.Repository;
 using TINK.Repository.Response;
+using TINK.Repository.Response.Stations;
 
 namespace TINK.Model.Services.CopriApi
 {
@@ -16,7 +17,7 @@ namespace TINK.Model.Services.CopriApi
 		/// <returns>Response holding list of bikes.</returns>
 		Task<Result<BikesAvailableResponse>> GetBikesAvailable(bool fromCache = false);
 
-		/// <summary> Gets a list of bikes reserved/ booked by acctive user from Copri.</summary>
+		/// <summary> Gets a list of bikes reserved/ booked by active user from Copri.</summary>
 		/// <returns>Response holding list of bikes.</returns>
 		Task<Result<BikesReservedOccupiedResponse>> GetBikesOccupied(bool fromCache = false);
 
diff --git a/TINKLib/Services/CopriApi/ICopriCache.cs b/TINKLib/Services/CopriApi/ICopriCache.cs
index fcaa471..4e73278 100644
--- a/TINKLib/Services/CopriApi/ICopriCache.cs
+++ b/TINKLib/Services/CopriApi/ICopriCache.cs
@@ -1,5 +1,6 @@
 using TINK.Repository;
 using TINK.Repository.Response;
+using TINK.Repository.Response.Stations;
 
 namespace TINK.Model.Services.CopriApi
 {
diff --git a/TINKLib/Services/CopriApi/Polling.cs b/TINKLib/Services/CopriApi/Polling.cs
index 2cca2e7..c155379 100644
--- a/TINKLib/Services/CopriApi/Polling.cs
+++ b/TINKLib/Services/CopriApi/Polling.cs
@@ -112,7 +112,7 @@ namespace TINK.Services.CopriApi
 			if (lockingState == null)
 			{
 				// User did not take bike out of the station
-				throw new BikeStillInStationException("Booking was cancelled because bike is still in station.");
+				throw new BikeStillInStationException("Booking was canceled because bike is still in station.");
 			}
 
 			// Upate booking state.
diff --git a/TINKLib/Services/CopriApi/Result.cs b/TINKLib/Services/CopriApi/Result.cs
index dd53699..96bfe97 100644
--- a/TINKLib/Services/CopriApi/Result.cs
+++ b/TINKLib/Services/CopriApi/Result.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using TINK.Services.CopriApi;
 
 namespace TINK.Model.Services.CopriApi
@@ -10,7 +10,7 @@ namespace TINK.Model.Services.CopriApi
 		/// </summary>
 		/// <param name="source">Type of source (data provider).</param>
 		/// <param name="response">Requested data (bikes, station).</param>
-		/// <param name="generalData">General data (common to all respones).</param>
+		/// <param name="generalData">General data (common to all responses).</param>
 		public Result(
 			Type source,
 			T response,
diff --git a/TINKLib/Services/CopriApi/StationsAndBikesContainer.cs b/TINKLib/Services/CopriApi/StationsAndBikesContainer.cs
index 0a9bf8f..e04bbec 100644
--- a/TINKLib/Services/CopriApi/StationsAndBikesContainer.cs
+++ b/TINKLib/Services/CopriApi/StationsAndBikesContainer.cs
@@ -1,5 +1,5 @@
-using TINK.Model.Bikes;
-using TINK.Model.Station;
+using TINK.Model.Bikes;
+using TINK.Model.Stations;
 
 namespace TINK.Model.Services.CopriApi
 {
diff --git a/TINKLib/Services/Geolocation/GeolocationService.cs b/TINKLib/Services/Geolocation/GeolocationService.cs
index a24577a..eb429d3 100644
--- a/TINKLib/Services/Geolocation/GeolocationService.cs
+++ b/TINKLib/Services/Geolocation/GeolocationService.cs
@@ -30,7 +30,7 @@ namespace TINK.Services.Geolocation
 
 		/// <summary> Gets the current location.</summary>
 		/// <param name="cancellationToken">Token to cancel request for geolocation.</param>
-		/// <param name="timeStamp">Time when geolocation is of interest. Is used to determine whether cached geoloation can be used or not.</param>
+		/// <param name="timeStamp">Time when geolocation is of interest. Is used to determine whether cached geolocation can be used or not.</param>
 		public async Task<IGeolocation> GetAsync(CancellationToken? cancellationToken = null, DateTime? timeStamp = null)
 		{
 			try
diff --git a/TINKLib/Services/Geolocation/IGeolocationService.cs b/TINKLib/Services/Geolocation/IGeolocationService.cs
index f2bced7..791b3ae 100644
--- a/TINKLib/Services/Geolocation/IGeolocationService.cs
+++ b/TINKLib/Services/Geolocation/IGeolocationService.cs
@@ -2,7 +2,6 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 using TINK.Model.Device;
-using Xamarin.Essentials;
 
 namespace TINK.Services.Geolocation
 {
@@ -11,7 +10,7 @@ namespace TINK.Services.Geolocation
 	{
 		/// <summary> Gets the current location.</summary>
 		/// <param name="cancellationToken">Token to cancel request for geolocation. If null request can not be cancels and times out after GeolocationService.GEOLOCATIONREQUEST_TIMEOUT_MS if geolocation is not available.</param>
-		/// <param name="timeStamp">Time when geolocation is of interest. Is used to determine for some implementations whether cached geoloation can be used or not.</param>
+		/// <param name="timeStamp">Time when geolocation is of interest. Is used to determine for some implementations whether cached geolocation can be used or not.</param>
 		/// <returns></returns>
 		Task<IGeolocation> GetAsync(CancellationToken? cancellationToken = null, DateTime? timeStamp = null);
 
diff --git a/TINKLib/Services/Geolocation/LastKnownGeolocationService.cs b/TINKLib/Services/Geolocation/LastKnownGeolocationService.cs
index 4a28338..0ea884e 100644
--- a/TINKLib/Services/Geolocation/LastKnownGeolocationService.cs
+++ b/TINKLib/Services/Geolocation/LastKnownGeolocationService.cs
@@ -18,7 +18,7 @@ namespace TINK.Services.Geolocation
 
 		/// <summary> Gets the current location.</summary>
 		/// <param name="cancelationToken">Token to cancel request for geolocation.</param>
-		/// <param name="timeStamp">Time when geolocation is of interest. Is used to determine whether cached geoloation can be used or not.</param>
+		/// <param name="timeStamp">Time when geolocation is of interest. Is used to determine whether cached geolocation can be used or not.</param>
 		public async Task<IGeolocation> GetAsync(CancellationToken? cancelationToken = null, DateTime? timeStamp = null)
 		{
 			IGeolocation location;
diff --git a/TINKLib/Services/Geolocation/SimulatedGeolocationService.cs b/TINKLib/Services/Geolocation/SimulatedGeolocationService.cs
index c0c3e34..cc971bc 100644
--- a/TINKLib/Services/Geolocation/SimulatedGeolocationService.cs
+++ b/TINKLib/Services/Geolocation/SimulatedGeolocationService.cs
@@ -17,7 +17,7 @@ namespace TINK.Services.Geolocation
 
 		/// <summary> Gets the current location.</summary>
 		/// <param name="cancelToken">Token to cancel request for geolocation.</param>
-		/// <param name="timeStamp">Time when geolocation is of interest. Is used to determine whether cached geoloation can be used or not.</param>
+		/// <param name="timeStamp">Time when geolocation is of interest. Is used to determine whether cached geolocation can be used or not.</param>
 		public async Task<IGeolocation> GetAsync(CancellationToken? cancelToken = null, DateTime? timeStamp = null)
 		{
 			return await Task.FromResult(new Geolocation.Builder {
diff --git a/TINKLib/View/IViewService.cs b/TINKLib/View/IViewService.cs
index 7324f17..d2165e4 100644
--- a/TINKLib/View/IViewService.cs
+++ b/TINKLib/View/IViewService.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
 
 namespace TINK.View
@@ -114,7 +114,7 @@ namespace TINK.View
 	public interface IUserFeedback
 	{
 		/// <summary>
-		/// Holds the current chargeing level of the battery in bars, null if unkonwn.
+		/// Holds the current charging level of the battery in bars, null if unknown.
 		/// </summary>
 		int? CurrentChargeBars { get; set; }
 
diff --git a/TINKLib/ViewModel/Account/AccountPageViewModel.cs b/TINKLib/ViewModel/Account/AccountPageViewModel.cs
index b97481d..7d00b30 100644
--- a/TINKLib/ViewModel/Account/AccountPageViewModel.cs
+++ b/TINKLib/ViewModel/Account/AccountPageViewModel.cs
@@ -1,4 +1,4 @@
-
+
 using System;
 using System.ComponentModel;
 using System.Threading.Tasks;
@@ -49,8 +49,8 @@ namespace TINK.ViewModel.Account
 		/// <param name="p_oDevice"></param>
 		/// <param name="p_oFilterGroup">Filter to apply on stations and bikes.</param>
 		/// <param name="p_oUris">Available copri server host uris including uri to use for next start.</param>
-		/// <param name="p_oPolling"> Holds whether to poll or not and the periode leght is polling is on. </param>
-		/// <param name="p_oDefaultPollingPeriode">Default polling periode lenght.</param>
+		/// <param name="p_oPolling"> Holds whether to poll or not and the period length is polling is on. </param>
+		/// <param name="p_oDefaultPollingPeriode">Default polling period length.</param>
 		/// <param name="p_oMinimumLogEventLevel">Controls logging level.</param>
 		/// <param name="viewService">Interface to view</param>
 		public AccountPageViewModel(
@@ -159,7 +159,7 @@ namespace TINK.ViewModel.Account
 		}
 
 		/// <summary>
-		/// Gets a value indicating whether booking state info is avilable or not.
+		/// Gets a value indicating whether booking state info is available or not.
 		/// </summary>
 		public bool IsBookingStateInfoVisible
 		{
@@ -429,7 +429,7 @@ namespace TINK.ViewModel.Account
 			}
 		}
 
-		/// <summary>Polling periode.</summary>
+		/// <summary>Polling period.</summary>
 		public PollingViewModel Polling { get; }
 
 		/// <summary> Opens login page.</summary>
diff --git a/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Disposable.cs b/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Disposable.cs
index 1767b3c..bffa8d0 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Disposable.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Disposable.cs
@@ -44,7 +44,7 @@ namespace TINK.ViewModel.Bikes.Bike.BC.RequestHandler
 			if (l_oResult == false)
 			{
 				// User aborted booking process
-				Log.ForContext<Disposable>().Information("User selected availalbe bike {l_oId} in order to reserve but action was canceled.", SelectedBike.Id);
+				Log.ForContext<Disposable>().Information("User selected centered bike {l_oId} in order to reserve but action was canceled.", SelectedBike.Id);
 				BikesViewModel.IsIdle = true;
 				return this;
 			}
@@ -77,7 +77,7 @@ namespace TINK.ViewModel.Bikes.Bike.BC.RequestHandler
 					|| exception is RequestNotCachableException)
 				{
 					// Copri server is not reachable.
-					Log.ForContext<Disposable>().Information("User selected availalbe bike {l_oId} but reserving failed (Copri server not reachable).", SelectedBike.Id);
+					Log.ForContext<Disposable>().Information("User selected centered bike {l_oId} but reserving failed (Copri server not reachable).", SelectedBike.Id);
 
 					BikesViewModel.ActionText = string.Empty;
 					await ViewService.DisplayAlert(
@@ -87,7 +87,7 @@ namespace TINK.ViewModel.Bikes.Bike.BC.RequestHandler
 				}
 				else
 				{
-					Log.ForContext<Disposable>().Error("User selected availalbe bike {l_oId} but reserving failed. {@l_oException}", SelectedBike.Id, exception);
+					Log.ForContext<Disposable>().Error("User selected centered bike {l_oId} but reserving failed. {@l_oException}", SelectedBike.Id, exception);
 
 					BikesViewModel.ActionText = string.Empty;
 					await ViewService.DisplayAlert(AppResources.MessageReservingBikeErrorGeneralTitle, exception.Message, AppResources.MessageAnswerOk);
diff --git a/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Reserved.cs b/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Reserved.cs
index d8df384..44f13a8 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Reserved.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandler/Reserved.cs
@@ -61,7 +61,7 @@ namespace TINK.ViewModel.Bikes.Bike.BC.RequestHandler
 
 				await ConnectorFactory(IsConnected).Command.DoCancelReservation(SelectedBike);
 
-				// If canceling bike succedes remove bike because it is not ready to be booked again
+				// If canceling bike succeeds remove bike because it is not ready to be booked again
 				IsRemoveBikeRequired = true;
 			}
 			catch (Exception exception)
diff --git a/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandlerFactory.cs b/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandlerFactory.cs
index e8cbf70..cd73aeb 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandlerFactory.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BC/RequestHandlerFactory.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Model.User;
@@ -37,7 +37,7 @@ namespace TINK.ViewModel.Bikes.Bike.BC
 						activeUser);
 
 				case Model.State.InUseStateEnum.Reserved:
-					// Reservation can be cancelled.
+					// Reservation can be canceled.
 					return new Reserved(
 						selectedBike,
 						isConnectedDelegate,
diff --git a/TINKLib/ViewModel/Bikes/Bike/BikeViewModelBase.cs b/TINKLib/ViewModel/Bikes/Bike/BikeViewModelBase.cs
index a0ac07d..7975b15 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BikeViewModelBase.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BikeViewModelBase.cs
@@ -2,6 +2,7 @@ using Serilog;
 using System;
 using System.ComponentModel;
 using System.Text.RegularExpressions;
+using TINK.Model.Bikes.BikeInfoNS.BikeNS;
 #if !USEFLYOUT
 #endif
 using TINK.Model.Connector;
@@ -38,7 +39,7 @@ namespace TINK.ViewModel.Bikes.Bike
 		/// </summary>
 		protected IViewService ViewService { get; }
 
-		/// <summary> Provides a connect orobject.</summary>
+		/// <summary> Provides a connect object.</summary>
 		protected Func<bool, IConnector> ConnectorFactory { get; }
 
 		/// <summary> Delegate to retrieve connected state. </summary>
@@ -75,7 +76,7 @@ namespace TINK.ViewModel.Bikes.Bike
 		public abstract event PropertyChangedEventHandler PropertyChanged;
 
 		/// <summary>
-		/// Notfies childs about changed bike state.
+		/// Notifies children about changed bike state.
 		/// </summary>
 		public abstract void OnSelectedBikeStateChanged();
 
@@ -175,6 +176,11 @@ namespace TINK.ViewModel.Bikes.Bike
 
 		public string TypeOfBike => Bike.GetDisplayTypeOfBike();
 
+		/// <summary>
+		/// Gets whether bike is a AA bike (bike must be always returned a the same station) or AB bike (start and end stations can be different stations).
+		/// </summary>
+		public AaRideType? AaRideType => Bike.AaRideType;
+
 		public string WheelType => Bike.GetDisplayWheelType();
 
 		/// <summary>
@@ -187,6 +193,8 @@ namespace TINK.ViewModel.Bikes.Bike
 		/// </summary>
 		public string Id => Bike.Id;
 
+		public string StationId => $"Station {Bike.StationId}";
+
 		public bool IsBikeWithCopriLock => Bike.LockModel == Model.Bikes.BikeInfoNS.BikeNS.LockModel.Sigo;
 
 		/// Returns if type of bike is a cargo pedelec bike.
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/BikeViewModel.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/BikeViewModel.cs
index 9f6038d..c359539 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/BikeViewModel.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/BikeViewModel.cs
@@ -23,6 +23,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock
 	public class BikeViewModel : BikeViewModelBase, INotifyPropertyChanged
 	{
 		public Xamarin.Forms.Command ShowTrackingInfoCommand { get; private set; }
+		public Xamarin.Forms.Command ShowRideTypeInfoCommand { get; private set; }
 
 		/// <summary> Notifies GUI about changes. </summary>
 		public override event PropertyChangedEventHandler PropertyChanged;
@@ -112,6 +113,15 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock
 
 			});
 
+			ShowRideTypeInfoCommand = new Xamarin.Forms.Command(async () => {
+
+				await ViewService.DisplayAlert(
+						AppResources.MessageAaRideTypeInfoTitle,
+						TariffDescription.RideTypeText,
+						AppResources.MessageAnswerOk);
+
+			});
+
 			RequestHandler = user.IsLoggedIn
 				? RequestHandlerFactory.Create(
 					selectedBike,
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedClosed.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedClosed.cs
index 2e71688..c54c352 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedClosed.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedClosed.cs
@@ -101,7 +101,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
 			}
 
-			// Check if quering geolocation is required.
+			// Check if querying geolocation is required.
 			if (currentLocation == null)
 			{
 				BikesViewModel.ActionText = AppResources.ActivityTextQueryLocationStart;    
@@ -216,7 +216,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					SelectedBike,
 					currentLocationDto);
 
-				// If canceling bike succedes remove bike because it is not ready to be booked again
+				// If canceling bike succeeds remove bike because it is not ready to be booked again
 				IsRemoveBikeRequired = true;
 			}
 			catch (Exception exception)
@@ -238,7 +238,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				{
 					// COPRI returned an error.
 					Log.ForContext<BookedClosed>().Information(
-							"User selected booked bike {bike} but returning failed. COPRI returned out of GEO fencing error. Postion send to COPRI {@position}.",
+							"User selected booked bike {bike} but returning failed. COPRI returned out of GEO fencing error. Position send to COPRI {@position}.",
 							SelectedBike,
 							currentLocationDto);
 
@@ -427,7 +427,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 						"OK");
 				}
 
-				// When bold is blocked lock is still closed even if exception occurres.
+				// When bold is blocked lock is still closed even if exception occurs.
 				// In all other cases state is supposed to be unknown. Example: Lock is out of reach and no more bluetooth connected.
 				SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
 					? stateAwareException.State
@@ -449,13 +449,13 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				if (exception is OutOfReachException)
 				{
-					Log.ForContext<BookedClosed>().Debug("Akkustate can not be read, bike out of range. {Exception}", exception);
+					Log.ForContext<BookedClosed>().Debug("Battery state can not be read, bike out of range. {Exception}", exception);
 
 					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelOutOfReach;
 				}
 				else
 				{
-					Log.ForContext<BookedClosed>().Error("Akkustate can not be read. {Exception}", exception);
+					Log.ForContext<BookedClosed>().Error("Battery state can not be read. {Exception}", exception);
 
 					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelGeneral;
 				}
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedDisconnected.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedDisconnected.cs
index 0ef34ab..675dea1 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedDisconnected.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedDisconnected.cs
@@ -55,7 +55,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 		/// <returns></returns>
 		public async Task<IRequestHandler> HandleRequestOption2() => await ConnectLock();
 
-		/// <summary> Requst is not supported, button should be disabled. </summary>
+		/// <summary> Request is not supported, button should be disabled. </summary>
 		/// <returns></returns>
 		public async Task<IRequestHandler> UnsupportedRequest()
 		{
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedOpen.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedOpen.cs
index 60da064..d3b1818 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedOpen.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedOpen.cs
@@ -119,11 +119,11 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				return this;
 			}
 
-			// Start of closing lock and returing bike sequence.
+			// Start of closing lock and returning bike sequence.
 			Log.ForContext<BookedOpen>().Information("Request to return bike {bike} detected.", SelectedBike);
 
-			// Clear logging memory sink to avoid passing log data not related to returning of bike to backend.
-			// Log data is passed to backend when calling CopriCallsHttps.DoReturn().
+			// Clear logging memory sink to avoid passing log data not related to returning of bike to back-end.
+			// Log data is passed to back end when calling CopriCallsHttps.DoReturn().
 			MemoryStackSink.ClearMessages();
 
 			// Stop polling before returning bike.
@@ -260,7 +260,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			// Check locking state.
 			if (SelectedBike.LockInfo.State != LockingState.Closed)
 			{
-				Log.ForContext<BookedOpen>().Error($"Lock can not be closed. Invalid locking state state {SelectedBike.LockInfo.State} detected.");
+				Log.ForContext<BookedOpen>().Error($"Lock can not be closed. Invalid locking state {SelectedBike.LockInfo.State} detected.");
 
 				BikesViewModel.ActionText = string.Empty;
 
@@ -298,7 +298,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				catch (Exception innerExWhenAll)
 				{
 					// No location information available.
-					Log.ForContext<BookedOpen>().Information("Canceling query location/ updating lock state failed failed on unexpected lock state failed. {Exception}", SelectedBike, innerExWhenAll);
+					Log.ForContext<BookedOpen>().Information("Canceling query location/ updating lock state failed on unexpected lock state failed. {Exception}", SelectedBike, innerExWhenAll);
 				}
 
 				BikesViewModel.ActionText = AppResources.ActivityTextStartingUpdater;
@@ -360,7 +360,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					SelectedBike,
 					currentLocationDto,
 					SmartDevice);
-				// If canceling bike succedes remove bike because it is not ready to be booked again
+				// If canceling bike succeeds remove bike because it is not ready to be booked again
 				IsRemoveBikeRequired = true;
 			}
 			catch (Exception exception)
@@ -382,7 +382,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				{
 					// COPRI returned an error.
 					Log.ForContext<BookedOpen>().Information(
-						"User selected booked bike {bike} but returning failed. COPRI returned out of GEO fencing error. Postion send to COPRI {@position}.",
+						"User selected booked bike {bike} but returning failed. COPRI returned out of GEO fencing error. Position send to COPRI {@position}.",
 						SelectedBike,
 						currentLocationDto);
 
@@ -510,8 +510,8 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			BikesViewModel.IsIdle = false;
 			Log.ForContext<BookedOpen>().Information("User request to lock bike {bike} in order to pause ride.", SelectedBike);
 
-			// Clear logging memory sink to avoid passing log data not related to returning of bike to backend.
-			// Log data is passed to backend when calling CopriCallsHttps.DoReturn().
+			// Clear logging memory sink to avoid passing log data not related to returning of bike to back end.
+			// Log data is passed to back end when calling CopriCallsHttps.DoReturn().
 			MemoryStackSink.ClearMessages();
 
 			// Start getting geolocation.
@@ -608,7 +608,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
 			}
 
-			// Get geoposition.
+			// Get geolocation.
 			BikesViewModel.ActionText = AppResources.ActivityTextQueryLocation;
 			IGeolocation currentLocation = null;
 			try
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedUnknown.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedUnknown.cs
index a95a651..cc256b7 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedUnknown.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/BookedUnknown.cs
@@ -14,7 +14,6 @@ using TINK.Services.BluetoothLock;
 using TINK.Services.BluetoothLock.Exception;
 using TINK.Services.Geolocation;
 using TINK.View;
-using Xamarin.Essentials;
 
 namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
@@ -126,7 +125,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 						AppResources.MessageAnswerOk);
 				}
 
-				// When bold is blocked lock is still closed even if exception occurres.
+				// When bold is blocked lock is still closed even if exception occurs.
 				// In all other cases state is supposed to be unknown. Example: Lock is out of reach and no more bluetooth connected.
 				SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
 					? stateAwareException.State
@@ -148,13 +147,13 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				if (exception is OutOfReachException)
 				{
-					Log.ForContext<BookedUnknown>().Debug("Akkustate can not be read, bike out of range. {Exception}", exception);
+					Log.ForContext<BookedUnknown>().Debug("Battery state can not be read, bike out of range. {Exception}", exception);
 
 					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelOutOfReach;
 				}
 				else
 				{
-					Log.ForContext<BookedUnknown>().Error("Akkustate can not be read. {Exception}", exception);
+					Log.ForContext<BookedUnknown>().Error("Battery state can not be read. {Exception}", exception);
 
 					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelGeneral;
 				}
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableDisconnected.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableDisconnected.cs
index 98f98a4..a3f29d1 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableDisconnected.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableDisconnected.cs
@@ -69,7 +69,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			if (alertResult == false)
 			{
 				// User aborted booking process
-				Log.ForContext<DisposableDisconnected>().Information("User selected availalbe bike {bike} in order to reserve but action was canceled.", SelectedBike);
+				Log.ForContext<DisposableDisconnected>().Information("User selected centered bike {bike} in order to reserve but action was canceled.", SelectedBike);
 				BikesViewModel.IsIdle = true;
 				return this;
 			}
@@ -106,7 +106,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 					|| exception is RequestNotCachableException)
 				{
 					// Copri server is not reachable.
-					Log.ForContext<DisposableDisconnected>().Information("User selected availalbe bike {bike} but reserving failed (Copri server not reachable).", SelectedBike);
+					Log.ForContext<DisposableDisconnected>().Information("User selected centered bike {bike} but reserving failed (Copri server not reachable).", SelectedBike);
 
 					await ViewService.DisplayAlert(
 						AppResources.MessageReservingBikeErrorConnectionTitle,
@@ -115,7 +115,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				}
 				else
 				{
-					Log.ForContext<DisposableDisconnected>().Error("User selected availalbe bike {bike} but reserving failed. {@l_oException}", SelectedBike, exception);
+					Log.ForContext<DisposableDisconnected>().Error("User selected centered bike {bike} but reserving failed. {@l_oException}", SelectedBike, exception);
 
 					await ViewService.DisplayAlert(
 						AppResources.MessageReservingBikeErrorGeneralTitle,
@@ -346,13 +346,13 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				if (exception is OutOfReachException)
 				{
-					Log.ForContext<DisposableDisconnected>().Debug("Akkustate can not be read, bike out of range. {Exception}", exception);
+					Log.ForContext<DisposableDisconnected>().Debug("Battery state can not be read, bike out of range. {Exception}", exception);
 
 					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelOutOfReach;
 				}
 				else
 				{
-					Log.ForContext<DisposableDisconnected>().Error("Akkustate can not be read. {Exception}", exception);
+					Log.ForContext<DisposableDisconnected>().Error("Battery state can not be read. {Exception}", exception);
 
 					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelGeneral;
 				}
@@ -407,7 +407,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
 		}
 
-		/// <summary> Requst is not supported, button should be disabled. </summary>
+		/// <summary> Request is not supported, button should be disabled. </summary>
 		/// <returns></returns>
 		public async Task<IRequestHandler> UnsupportedRequest()
 		{
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableOpen.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableOpen.cs
index ba9ecea..3245b6b 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableOpen.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/DisposableOpen.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Serilog;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
@@ -26,7 +26,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 	{
 		/// <summary> Bike is disposable, lock is open and can be reached via bluetooth. </summary>
 		/// <remarks> 
-		/// This state should never occure because as long as a ILOCKIT is connected it
+		/// This state should never occur because as long as a ILOCKIT is connected it
 		/// - cannot be closed manually 
 		/// - no other device can access lock
 		/// - app itself should never event attempt to open a lock which is not rented.
@@ -177,19 +177,19 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				if (exception is OutOfReachException)
 				{
-					Log.ForContext<DisposableOpen>().Debug("Akkustate can not be read, bike out of range. {Exception}", exception);
+					Log.ForContext<DisposableOpen>().Debug("Battery state can not be read, bike out of range. {Exception}", exception);
 
 					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelOutOfReach;
 				}
 				else
 				{
-					Log.ForContext<DisposableOpen>().Error("Akkustate can not be read. {Exception}", exception);
+					Log.ForContext<DisposableOpen>().Error("Battery state can not be read. {Exception}", exception);
 
 					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelGeneral;
 				}
 			}
 
-			// Notify corpi about unlock action in order to start booking.
+			// Notify copri about unlock action in order to start booking.
 			BikesViewModel.ActionText = AppResources.ActivityTextRentingBike;
 			IsConnected = IsConnectedDelegate();
 			try
@@ -270,7 +270,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
 		}
 
-		/// <summary> Requst is not supported, button should be disabled. </summary>
+		/// <summary> Request is not supported, button should be disabled. </summary>
 		/// <returns></returns>
 		public async Task<IRequestHandler> UnsupportedRequest()
 		{
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedClosed.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedClosed.cs
index c998fe5..1605f68 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedClosed.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedClosed.cs
@@ -16,11 +16,11 @@ using IBikeInfoMutable = TINK.Model.Bikes.BikeInfoNS.BluetoothLock.IBikeInfoMuta
 
 namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
-	/// <summary> Bike is reserved, lock is closed and and connected to app. </summary>
+	/// <summary> Bike is reserved, lock is closed and connected to app. </summary>
 	/// <remarks> 
-	/// Occures when 
-	/// - biks was reserved out of reach and is in reach now
-	/// - bike is is reserved while in reach
+	/// Occurs when 
+	/// - bike was reserved out of reach and is in reach now
+	/// - bike is reserved while in reach
 	/// </remarks>
 	public class ReservedClosed : Base, IRequestHandler
 	{
@@ -91,7 +91,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				await ConnectorFactory(IsConnected).Command.DoCancelReservation(SelectedBike);
 
-				// If canceling bike succedes remove bike because it is not ready to be booked again
+				// If canceling bike succeeds remove bike because it is not ready to be booked again
 				IsRemoveBikeRequired = true;
 			}
 			catch (Exception exception)
@@ -311,13 +311,13 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				if (exception is OutOfReachException)
 				{
-					Log.ForContext<ReservedClosed>().Debug("Akkustate can not be read, bike out of range. {Exception}", exception);
+					Log.ForContext<ReservedClosed>().Debug("Battery state can not be read, bike out of range. {Exception}", exception);
 
 					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelOutOfReach;
 				}
 				else
 				{
-					Log.ForContext<ReservedClosed>().Error("Akkustate can not be read. {Exception}", exception);
+					Log.ForContext<ReservedClosed>().Error("Battery state can not be read. {Exception}", exception);
 
 					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelGeneral;
 				}
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedDisconnected.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedDisconnected.cs
index 4c9bc91..dfad42f 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedDisconnected.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedDisconnected.cs
@@ -51,7 +51,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 		/// <summary> Cancel reservation. </summary>
 		public async Task<IRequestHandler> HandleRequestOption1() => await CancelReservation();
 
-		/// <summary> Connect to reserved bike ask whether to book bike bike or not and if yes open lock. </summary>
+		/// <summary> Connect to reserved bike ask whether to book bike or not and if yes open lock. </summary>
 		/// <returns></returns>
 		public async Task<IRequestHandler> HandleRequestOption2() => await ConnectLockAndBook();
 
@@ -86,7 +86,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				await ConnectorFactory(IsConnected).Command.DoCancelReservation(SelectedBike);
 
-				// If canceling bike succedes remove bike because it is not ready to be booked again
+				// If canceling bike succeeds remove bike because it is not ready to be booked again
 				IsRemoveBikeRequired = true;
 			}
 			catch (Exception exception)
@@ -136,7 +136,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
 		}
 
-		/// <summary> Connect to reserved bike ask whether to book bike bike or not and if yes open lock. </summary>
+		/// <summary> Connect to reserved bike ask whether to book bike or not and if yes open lock. </summary>
 		/// <returns></returns>
 		public async Task<IRequestHandler> ConnectLockAndBook()
 		{
@@ -474,13 +474,13 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				if (exception is OutOfReachException)
 				{
-					Log.ForContext<ReservedDisconnected>().Debug("Akkustate can not be read, bike out of range. {Exception}", exception);
+					Log.ForContext<ReservedDisconnected>().Debug("Battery state can not be read, bike out of range. {Exception}", exception);
 
 					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelOutOfReach;
 				}
 				else
 				{
-					Log.ForContext<ReservedDisconnected>().Error("Akkustate can not be read. {Exception}", exception);
+					Log.ForContext<ReservedDisconnected>().Error("Battery state can not be read. {Exception}", exception);
 
 					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelGeneral;
 				}
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedOpen.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedOpen.cs
index 9628ef7..8bb7a1f 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedOpen.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedOpen.cs
@@ -17,10 +17,10 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 {
 	/// <summary> Bike is reserved, lock is open and connected to app. </summary>
 	/// <remarks> 
-	/// This state might occure when a ILOCKIT was manually opened (color code) and app connects afterwards. 
+	/// This state might occur when a ILOCKIT was manually opened (color code) and app connects afterwards. 
 	/// This should never during ILOCKIT is connected to app because
 	/// - manually opening lock is not possible when lock is connected
-	/// - two devices can not simultaneously conect to same lock.
+	/// - two devices can not simultaneously connect to same lock.
 	public class ReservedOpen : Base, IRequestHandler
 	{
 		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
@@ -89,13 +89,13 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				{
 					if (exception is OutOfReachException)
 					{
-						Log.ForContext<ReservedOpen>().Debug("Akkustate can not be read, bike out of range. {Exception}", exception);
+						Log.ForContext<ReservedOpen>().Debug("Battery state can not be read, bike out of range. {Exception}", exception);
 
 						BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelOutOfReach;
 					}
 					else
 					{
-						Log.ForContext<ReservedOpen>().Error("Akkustate can not be read. {Exception}", exception);
+						Log.ForContext<ReservedOpen>().Error("Battery state can not be read. {Exception}", exception);
 
 						BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelGeneral;
 					}
@@ -229,7 +229,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				await ConnectorFactory(IsConnected).Command.DoCancelReservation(SelectedBike);
 
-				// If canceling bike succedes remove bike because it is not ready to be booked again
+				// If canceling bike succeeds remove bike because it is not ready to be booked again
 				IsRemoveBikeRequired = true;
 			}
 			catch (Exception exception)
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedUnknown.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedUnknown.cs
index c9a657f..e26921a 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedUnknown.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/ReservedUnknown.cs
@@ -122,7 +122,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 						AppResources.MessageAnswerOk);
 				}
 
-				// When bold is blocked lock is still closed even if exception occurres.
+				// When bold is blocked lock is still closed even if exception occurs.
 				// In all other cases state is supposed to be unknown. Example: Lock is out of reach and no more bluetooth connected.
 				SelectedBike.LockInfo.State = exception is StateAwareException stateAwareException
 					? stateAwareException.State
@@ -144,13 +144,13 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 			{
 				if (exception is OutOfReachException)
 				{
-					Log.ForContext<ReservedUnknown>().Debug("Akkustate can not be read, bike out of range. {Exception}", exception);
+					Log.ForContext<ReservedUnknown>().Debug("Battery state can not be read, bike out of range. {Exception}", exception);
 
 					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelOutOfReach;
 				}
 				else
 				{
-					Log.ForContext<ReservedUnknown>().Error("Akkustate can not be read. {Exception}", exception);
+					Log.ForContext<ReservedUnknown>().Error("Battery state can not be read. {Exception}", exception);
 
 					BikesViewModel.ActionText = AppResources.ActivityTextErrorReadingChargingLevelGeneral;
 				}
@@ -310,7 +310,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 				return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, GeolocationService, LockService, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
 			}
 
-			// Get geoposition.
+			// Get geolocation.
 			BikesViewModel.ActionText = AppResources.ActivityTextQueryLocation;
 			IGeolocation currentLocation = null;
 			try
diff --git a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandlerFactory.cs b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandlerFactory.cs
index 0e972da..c44569f 100644
--- a/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandlerFactory.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandlerFactory.cs
@@ -43,11 +43,11 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock
 			{
 				case Model.State.InUseStateEnum.Disposable:
 
-					// Bike is reserved, selecte action depending on lock state.
+					// Bike is reserved, select action depending on lock state.
 					switch (selectedBluetoothLockBike.LockInfo.State)
 					{
 						case LockingState.Closed:
-							// Unexepected state detected.
+							// Unexpected state detected.
 							// This state is unexpected because connection is closed
 							// - when reservation is canceled or 
 							// - when bike is returned.
@@ -60,13 +60,13 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock
 
 						case LockingState.Open:
 						case LockingState.UnknownFromHardwareError:
-							// Unexepected state detected.
+							// Unexpected state detected.
 							/// This state is unexpected because
 							/// - app does not allow to return bike/ cancel reservation when lock is closed
 							/// - as long as app is connected to lock
 							///     - lock can not be opened manually
 							///     - no other device can access lock 
-							/// Nevetheless this state is not expected let user either
+							/// Nevertheless this state is not expected let user either
 							/// - close lock or
 							/// - rent bike
 							/// </remarks>
@@ -100,7 +100,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock
 
 				case Model.State.InUseStateEnum.Reserved:
 
-					// Bike is reserved, selecte action depending on lock state.
+					// Bike is reserved, select action depending on lock state.
 					switch (selectedBluetoothLockBike.LockInfo.State)
 					{
 						case LockingState.Closed:
@@ -132,7 +132,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock
 
 						case LockingState.Open:
 							// Unwanted state detected.
-							/// This state might occure when a ILOCKIT was manually opened (color code) and app connects afterwards.
+							/// This state might occur when a ILOCKIT was manually opened (color code) and app connects afterwards.
 							Log.Error("Unwanted state {BookingState}/ {LockingState} detected.", selectedBluetoothLockBike.State.Value, selectedBluetoothLockBike.LockInfo.State);
 							return new ReservedOpen(
 								selectedBluetoothLockBike,
@@ -167,7 +167,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock
 
 				case Model.State.InUseStateEnum.Booked:
 
-					// Bike is booked, selecte action depending on lock state.
+					// Bike is booked, select action depending on lock state.
 					switch (selectedBluetoothLockBike.LockInfo.State)
 					{
 						case LockingState.Closed:
@@ -214,7 +214,7 @@ namespace TINK.ViewModel.Bikes.Bike.BluetoothLock
 
 						default:
 							// Invalid state detected. 
-							// If bike is booked lock state must be querried before creating view model.
+							// If bike is booked lock state must be queried before creating view model.
 							return new BookedDisconnected(
 								selectedBluetoothLockBike,
 								isConnectedDelegate,
diff --git a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/BookedClosed.cs b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/BookedClosed.cs
index 7866792..43b0cf3 100644
--- a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/BookedClosed.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/BookedClosed.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Serilog;
 using TINK.Model.Bikes.BikeInfoNS.CopriLock;
@@ -47,7 +47,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 		/// <summary> Open bike and update COPRI lock state. </summary>
 		public async Task<IRequestHandler> HandleRequestOption2() => await OpenLock();
 
-		/// <summary> Requst is not supported, button should be disabled. </summary>
+		/// <summary> Request is not supported, button should be disabled. </summary>
 		public async Task<IRequestHandler> UnsupportedRequest()
 		{
 			Log.ForContext<BookedClosed>().Error("Click of unsupported button click detected.");
diff --git a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/BookedOpen.cs b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/BookedOpen.cs
index 378e699..4910625 100644
--- a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/BookedOpen.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/BookedOpen.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Serilog;
 using TINK.Model.Bikes.BikeInfoNS.CopriLock;
@@ -48,7 +48,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 		/// <summary> Close lock in order to pause ride and update COPRI lock state.</summary>
 		public async Task<IRequestHandler> HandleRequestOption2() => await OpenLock();
 
-		/// <summary> Requst is not supported, button should be disabled. </summary>
+		/// <summary> Request is not supported, button should be disabled. </summary>
 		public async Task<IRequestHandler> UnsupportedRequest()
 		{
 			Log.ForContext<BookedOpen>().Error("Click of unsupported button click detected.");
diff --git a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/DisposableClosed.cs b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/DisposableClosed.cs
index 3e0b9c1..fc5334f 100644
--- a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/DisposableClosed.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/DisposableClosed.cs
@@ -63,7 +63,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			if (alertResult == false)
 			{
 				// User aborted booking process
-				Log.ForContext<DisposableClosed>().Information("User selected bike {bike} in order to book and release bike from station but action was cancelled.", SelectedBike);
+				Log.ForContext<DisposableClosed>().Information("User selected bike {bike} in order to book and release bike from station but action was canceled.", SelectedBike);
 
 				BikesViewModel.IsIdle = true;
 				return this;
@@ -139,7 +139,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			if (alertResult == false)
 			{
 				// User aborted booking process
-				Log.ForContext<DisposableClosed>().Information("User selected availalbe bike {bike} in order to reserve but action was canceled.", SelectedBike);
+				Log.ForContext<DisposableClosed>().Information("User selected centered bike {bike} in order to reserve but action was canceled.", SelectedBike);
 				BikesViewModel.IsIdle = true;
 				return this;
 			}
@@ -175,7 +175,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 					|| exception is RequestNotCachableException)
 				{
 					// Copri server is not reachable.
-					Log.ForContext<DisposableClosed>().Information("User selected availalbe bike {bike} but reserving failed (Copri server not reachable).", SelectedBike);
+					Log.ForContext<DisposableClosed>().Information("User selected centered bike {bike} but reserving failed (Copri server not reachable).", SelectedBike);
 
 					await ViewService.DisplayAdvancedAlert(
 						AppResources.MessageReservingBikeErrorConnectionTitle,
@@ -185,7 +185,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 				}
 				else
 				{
-					Log.ForContext<DisposableClosed>().Error("User selected availalbe bike {bike} but reserving failed. {@exception}", SelectedBike, exception);
+					Log.ForContext<DisposableClosed>().Error("User selected centered bike {bike} but reserving failed. {@exception}", SelectedBike, exception);
 
 					await ViewService.DisplayAlert(
 						AppResources.MessageReservingBikeErrorGeneralTitle,
diff --git a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/FeedbackPending.cs b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/FeedbackPending.cs
index 8b7966f..f05cc57 100644
--- a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/FeedbackPending.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/FeedbackPending.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Serilog;
 using TINK.Model.Bikes.BikeInfoNS.CopriLock;
@@ -46,7 +46,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 		/// <summary> Open bike and update COPRI lock state. </summary>
 		public async Task<IRequestHandler> HandleRequestOption2() => await GiveFeedback();
 
-		/// <summary> Requst is not supported, button should be disabled. </summary>
+		/// <summary> Request is not supported, button should be disabled. </summary>
 		/// <returns></returns>
 		public async Task<IRequestHandler> UnsupportedRequest()
 		{
@@ -110,7 +110,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			if (SelectedBike?.BookingFinishedModel?.MiniSurvey?.Questions?.Count > 0)
 			{
-				// No need to restrart polling again because different page is shown.
+				// No need to restart polling again because different page is shown.
 				await ViewService.PushModalAsync(ViewTypes.MiniSurvey);
 			}
 
@@ -121,4 +121,4 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			return RequestHandlerFactory.Create(SelectedBike, IsConnectedDelegate, ConnectorFactory, ViewUpdateManager, SmartDevice, ViewService, BikesViewModel, ActiveUser);
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/ReservedClosed.cs b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/ReservedClosed.cs
index 6886688..4891712 100644
--- a/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/ReservedClosed.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/ReservedClosed.cs
@@ -14,11 +14,11 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 {
 	using IRequestHandler = BluetoothLock.IRequestHandler;
 
-	/// <summary> Bike is reserved, lock is closed and and connected to app. </summary>
+	/// <summary> Bike is reserved, lock is closed and connected to app. </summary>
 	/// <remarks> 
-	/// Occures when 
-	/// - biks was reserved out of reach and is in reach now
-	/// - bike is is reserved while in reach
+	/// Occurs when 
+	/// - bike was reserved out of reach and is in reach now
+	/// - bike is reserved while in reach
 	/// </remarks>
 	public class ReservedClosed : Base, IRequestHandler
 	{
@@ -85,7 +85,7 @@ namespace TINK.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 			{
 				await ConnectorFactory(IsConnected).Command.DoCancelReservation(SelectedBike);
 
-				// If canceling bike succedes remove bike because it is not ready to be booked again
+				// If canceling bike succeeds remove bike because it is not ready to be booked again
 				IsRemoveBikeRequired = true;
 			}
 			catch (Exception exception)
diff --git a/TINKLib/ViewModel/Bikes/Bike/TariffDescriptionViewModel.cs b/TINKLib/ViewModel/Bikes/Bike/TariffDescriptionViewModel.cs
index ca9aa18..9ce732a 100644
--- a/TINKLib/ViewModel/Bikes/Bike/TariffDescriptionViewModel.cs
+++ b/TINKLib/ViewModel/Bikes/Bike/TariffDescriptionViewModel.cs
@@ -11,6 +11,8 @@ namespace TINK.ViewModel.Bikes.Bike
 	{
 		private const string TRACKINGKEY = "TRACKING";
 
+		private const string RIDETYPEKEY = "AAFAHRTEN";
+
 		public TariffDescriptionViewModel(RentalDescription tariff)
 		{
 			Name = tariff?.Name ?? string.Empty;
@@ -19,13 +21,17 @@ namespace TINK.ViewModel.Bikes.Bike
 				? new ObservableCollection<RentalDescription.TariffElement>(tariff.TariffEntries.OrderBy(x => x.Key).Select(x => x.Value))
 				: new ObservableCollection<RentalDescription.TariffElement>();
 
+			// Add all entires except the known entries which are kept as properties.
 			InfoEntries = tariff != null && tariff?.InfoEntries != null
 				? new ObservableCollection<string>(tariff.InfoEntries
-				.Where(x => x.Value.Key.ToUpper() != TRACKINGKEY)
+				.Where(x => x.Value.Key.ToUpper() != TRACKINGKEY
+					&& x.Value.Key.ToUpper() != RIDETYPEKEY)
 				.OrderBy(x => x.Key)
 				.Select(x => x.Value.Value))
 				: new ObservableCollection<string>();
 
+			RideTypeText = tariff?.InfoEntries != null ? tariff?.InfoEntries?.FirstOrDefault(x => x.Value.Key.ToUpper() == RIDETYPEKEY).Value?.Value ?? string.Empty : string.Empty;
+
 			TrackingInfoText = tariff?.InfoEntries != null ? tariff?.InfoEntries?.FirstOrDefault(x => x.Value.Key.ToUpper() == TRACKINGKEY).Value?.Value ?? string.Empty : string.Empty;
 		}
 
@@ -44,6 +50,11 @@ namespace TINK.ViewModel.Bikes.Bike
 		/// </summary>
 		public ObservableCollection<string> InfoEntries { get; private set; }
 
+		/// <summary>
+		/// Holds the tracking info text or empty if not applicable.
+		/// </summary>
+		public string RideTypeText { get; private set; }
+
 		/// <summary>
 		/// Holds the tracking info text or empty if not applicable.
 		/// </summary>
diff --git a/TINKLib/ViewModel/Bikes/BikesViewModel.cs b/TINKLib/ViewModel/Bikes/BikesViewModel.cs
index 6363509..38ea6c2 100644
--- a/TINKLib/ViewModel/Bikes/BikesViewModel.cs
+++ b/TINKLib/ViewModel/Bikes/BikesViewModel.cs
@@ -44,7 +44,7 @@ namespace TINK.ViewModel.Bikes
 		/// <summary> Delegate to retrieve connected state. </summary>
 		protected Func<bool> IsConnectedDelegate { get; }
 
-		/// <summary>Holds whether to poll or not and the periode leght is polling is on.</summary>
+		/// <summary>Holds whether to poll or not and the period length is polling is on.</summary>
 		private TINK.Settings.PollingParameters m_oPolling;
 
 		/// <summary> Object to manage update of view model objects from Copri.</summary>
@@ -61,7 +61,7 @@ namespace TINK.ViewModel.Bikes
 		protected override void OnPropertyChanged(PropertyChangedEventArgs p_oEventArgs) => base.OnPropertyChanged(p_oEventArgs);
 
 		/// <summary>
-		/// Handles events from bike viewmodel which require GUI updates.
+		/// Handles events from bike view model which require GUI updates.
 		/// </summary>
 		/// <param name="sender"></param>
 		/// <param name="e"></param>
@@ -81,16 +81,16 @@ namespace TINK.ViewModel.Bikes
 		/// </param>
 		/// <param name="p_oUser">Mail address of active user.</param>
 		/// <param name="isReportLevelVerbose">True if report level is verbose, false if not.</param>
-		/// <param name="permissions">Holds object to query location permisions.</param>
+		/// <param name="permissions">Holds object to query location permissions.</param>
 		/// <param name="bluetoothLE">Holds object to query bluetooth state.</param>
 		/// <param name="runtimPlatform">Specifies on which platform code is run.</param>
 		/// <param name="isConnectedDelegate">Returns if mobile is connected to web or not.</param>
 		/// <param name="connectorFactory">Connects system to copri for purposes of requesting a bike/ cancel request.</param>
 		/// <param name="lockService">Service to control lock retrieve info.</param>
-		/// <param name="p_oPolling"> Holds whether to poll or not and the periode leght is polling is on. </param>
+		/// <param name="p_oPolling"> Holds whether to poll or not and the period length is polling is on. </param>
 		/// <param name="postAction">Executes actions on GUI thread.</param>
 		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...)</param>
-		/// <param name="viewService">Interface to actuate methodes on GUI.</param>
+		/// <param name="viewService">Interface to actuate methods on GUI.</param>
 		/// <param name="openUrlInBrowser">Delegate to open browser.</param>
 		public BikesViewModel(
 			User user,
@@ -156,7 +156,7 @@ namespace TINK.ViewModel.Bikes
 
 			CollectionChanged += (sender, eventargs) =>
 			{
-				// Notify about bikes occuring/ vanishing from list.
+				// Notify about bikes occurring/ vanishing from list.
 				OnPropertyChanged(new PropertyChangedEventArgs(nameof(IsBikesListVisible)));
 			};
 		}
@@ -173,7 +173,7 @@ namespace TINK.ViewModel.Bikes
 			{
 				case System.Collections.Specialized.NotifyCollectionChangedAction.Add:
 
-					// New bike avaialbe (new arrived at station or bike wased booked on a different device)
+					// New bike available (new arrived at station or bike was booked on a different device)
 					foreach (var bike in BikeCollection)
 					{
 						if (Contains(bike.Id))
@@ -415,7 +415,7 @@ namespace TINK.ViewModel.Bikes
 		/// <summary>
 		/// Gets whether a bike is contained in collection of bikes.
 		/// </summary>
-		/// <param name="id">Id of bike to check existance.</param>
+		/// <param name="id">Id of bike to check existence.</param>
 		/// <returns>True if bike exists.</returns>
 		private bool Contains(string id)
 		{
@@ -448,14 +448,14 @@ namespace TINK.ViewModel.Bikes
 		/// <summary>
 		/// Invoked when page is shown and starts update process.
 		/// </summary>
-		/// <param name="updateAction"> Update fuction passed as argument by child class.</param>
+		/// <param name="updateAction"> Update function passed as argument by child class.</param>
 		protected async Task OnAppearing(Action updateAction)
 			=> await StartUpdateTask(updateAction);
 
 		/// <summary>
 		/// Starts update process.
 		/// </summary>
-		/// <param name="updateAction"> Update fuction passed as argument by child class.</param>
+		/// <param name="updateAction"> Update function passed as argument by child class.</param>
 		public async Task StartUpdateTask(Action updateAction)
 		{
 			m_oViewUpdateManager = new PollingUpdateTaskManager(updateAction);
diff --git a/TINKLib/ViewModel/BikesAtStation/BikesAtStationPageViewModel.cs b/TINKLib/ViewModel/BikesAtStation/BikesAtStationPageViewModel.cs
index 24ee9fc..098aef4 100644
--- a/TINKLib/ViewModel/BikesAtStation/BikesAtStationPageViewModel.cs
+++ b/TINKLib/ViewModel/BikesAtStation/BikesAtStationPageViewModel.cs
@@ -12,7 +12,8 @@ using TINK.Model.Bikes;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
 using TINK.Model.Connector;
 using TINK.Model.Device;
-using TINK.Model.Station;
+using TINK.Model.Stations;
+using TINK.Model.Stations.StationNS;
 using TINK.Model.User;
 using TINK.MultilingualResources;
 using TINK.Services.BluetoothLock;
@@ -60,17 +61,17 @@ namespace TINK.ViewModel.BikesAtStation
 		/// Constructs bike collection view model.
 		/// </summary>
 		/// <param name="user">Mail address of active user.</param>
-		/// <param name="permissions">Holds object to query location permisions.</param>
+		/// <param name="permissions">Holds object to query location permissions.</param>
 		/// <param name="bluetoothLE">Holds object to query bluetooth state.</param>
 		/// <param name="runtimPlatform">Specifies on which platform code is run.</param>
 		/// <param name="isConnectedDelegate">Returns if mobile is connected to web or not.</param>
 		/// <param name="connectorFactory">Connects system to copri.</param>
 		/// <param name="lockService">Service to control lock retrieve info.</param>
-		/// <param name="polling"> Holds whether to poll or not and the periode leght is polling is on. </param>
+		/// <param name="polling"> Holds whether to poll or not and the period length is polling is on. </param>
 		/// <param name="openUrlInExternalBrowser">Action to open an external browser.</param>
 		/// <param name="postAction">Executes actions on GUI thread.</param>
 		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...).</param>
-		/// <param name="viewService">Interface to actuate methodes on GUI.</param>
+		/// <param name="viewService">Interface to actuate methods on GUI.</param>
 		public BikesAtStationPageViewModel(
 			User user,
 			ILocationPermission permissions,
@@ -384,7 +385,7 @@ namespace TINK.ViewModel.BikesAtStation
 			var exception = result.Exception;
 			if (exception != null)
 			{
-				Log.ForContext<BikesAtStationPageViewModel>().Error("Getting all bikes bikes in polling context failed with exception {Exception}.", exception);
+				Log.ForContext<BikesAtStationPageViewModel>().Error("Getting all bikes in polling context failed with exception {Exception}.", exception);
 			}
 
 			PostAction(
diff --git a/TINKLib/ViewModel/Contact/ContactPageViewModel.cs b/TINKLib/ViewModel/Contact/ContactPageViewModel.cs
index 17c30ab..b0eeec8 100644
--- a/TINKLib/ViewModel/Contact/ContactPageViewModel.cs
+++ b/TINKLib/ViewModel/Contact/ContactPageViewModel.cs
@@ -5,7 +5,8 @@ using System.Threading.Tasks;
 using System.Windows.Input;
 using Plugin.Messaging;
 using Serilog;
-using TINK.Model.Station;
+using TINK.Model.Stations;
+using TINK.Model.Stations.StationNS;
 using TINK.MultilingualResources;
 using TINK.View;
 using Xamarin.Essentials;
@@ -50,7 +51,7 @@ namespace TINK.ViewModel.Info
 		{
 			AppFlavorName = !string.IsNullOrEmpty(appFlavorName)
 				? appFlavorName
-				: throw new ArgumentException("Can not instantiate contact page view model- object. No app name availalbe.");
+				: throw new ArgumentException("Can not instantiate contact page view model- object. No app name centered.");
 
 			CreateAttachment = createAttachment
 				?? throw new ArgumentException("Can not instantiate contact page view model- object. No create attachment provider available.");
@@ -89,7 +90,7 @@ namespace TINK.ViewModel.Info
 					async () => await DoSendMailToOperator(),
 					() => IsSendMailAvailable);
 
-		/// <summary> Command object to bind mail app releated button to model. </summary>
+		/// <summary> Command object to bind mail app related button to model. </summary>
 		public ICommand OnMailAppRelatedRequest
 			=> new Command(
 					async () => await DoSendMailAppRelated(),
@@ -116,11 +117,11 @@ namespace TINK.ViewModel.Info
 		public string OfficeHoursText
 			=> SelectedStation?.OperatorData?.Hours ?? string.Empty;
 
-		/// <summary> Gets whether any operator support info is avaliable. </summary>
+		/// <summary> Gets whether any operator support info is available. </summary>
 		public bool IsOperatorInfoAvaliable
 			=> MailAddressText.Length > 0 || PhoneNumberText.Length > 0;
 
-		/// <returns> Returns true if eithe mail was sent or if no mailer available.</returns>
+		/// <returns> Returns true if either mail was sent or if no mailer available.</returns>
 		public async Task DoSendMailToOperator()
 		{
 			try
@@ -149,12 +150,12 @@ namespace TINK.ViewModel.Info
 					return;
 				}
 
-				// Send app-related related support mail to operator.
+				// Send app-related support mail to operator.
 				await Email.ComposeAsync(new EmailMessage
 				{
 					To = new List<string> { MailAddressText },
-					Cc = APPSUPPORTMAILADDRESS.ToUpper() != MailAddressText.ToUpper() // do not sent copy if same mail adress
-					&& MailAddressText != "konrad@sharee.bike" // do not sent copy if Meinkonrad
+					Cc = APPSUPPORTMAILADDRESS.ToUpper() != MailAddressText.ToUpper() // do not sent copy if same mail address
+					&& MailAddressText != "konrad@sharee.bike" // do not sent copy if Mein konrad
 					? new List<string> { APPSUPPORTMAILADDRESS } : new List<string>(),
 					Subject = string.Format(AppResources.SupportmailSubjectAppmail, AppFlavorName)
 				});
diff --git a/TINKLib/ViewModel/Contact/SelectStationPageViewModel.cs b/TINKLib/ViewModel/Contact/SelectStationPageViewModel.cs
index d51a155..bcc90aa 100644
--- a/TINKLib/ViewModel/Contact/SelectStationPageViewModel.cs
+++ b/TINKLib/ViewModel/Contact/SelectStationPageViewModel.cs
@@ -1,6 +1,6 @@
 using Xamarin.Forms;
 using TINK.View;
-using TINK.Model.Station;
+using TINK.Model.Stations;
 using System;
 using System.Linq;
 using TINK.Model.Bikes;
@@ -27,7 +27,7 @@ namespace TINK.ViewModel.Contact
 {
 	public class SelectStationPageViewModel : INotifyPropertyChanged
 	{
-		/// <summary> Holds the count of custom icons availalbe.</summary>
+		/// <summary> Holds the count of custom icons centered.</summary>
 		private const int CUSTOM_ICONS_COUNT = 30;
 
 		/// <summary> Reference on view service to show modal notifications and to perform navigation. </summary>
@@ -169,8 +169,8 @@ namespace TINK.ViewModel.Contact
 			{
 				if (station.Position == null)
 				{
-					// There should be no reason for a position object to be null but this alreay occurred in past.
-					Log.ForContext<SelectStationPageViewModel>().Error("Postion object of station {@l_oStation} is null.", station);
+					// There should be no reason for a position object to be null but this already occurred in past.
+					Log.ForContext<SelectStationPageViewModel>().Error("Position object of station {@l_oStation} is null.", station);
 					continue;
 				}
 
@@ -340,8 +340,8 @@ namespace TINK.ViewModel.Contact
 					Pins.Clear();
 				}
 
-				// Check if there are alreay any pins to the map 
-				// i.e detecte first call of member OnAppearing after construction
+				// Check if there are already any pins to the map 
+				// i.e detects first call of member OnAppearing after construction
 				if (Pins.Count <= 0)
 				{
 					// Map was not yet initialized.
@@ -457,7 +457,7 @@ namespace TINK.ViewModel.Contact
 					IsMapPageEnabled = false;
 				
 					TinkApp.SelectedStation = TinkApp.Stations.FirstOrDefault(x => x.Id == selectedStationId)
-					?? new Station(selectedStationId, new List<string>(), null); // Station might not be in list StationDictinaly because this list is not updatd in background task.
+					?? new Model.Stations.StationNS.Station(selectedStationId, new List<string>(), null); // Station might not be in list StationDictinaly because this list is not updated in background task.
 
 #if TRYNOTBACKSTYLE
                 m_oNavigation.ShowPage(
@@ -504,7 +504,7 @@ namespace TINK.ViewModel.Contact
 
 			if (bikesAll == null)
 			{
-				// If object is null an error occurred querrying bikes availalbe or bikes occpied which results in an unknown state.
+				// If object is null an error occurred querying bikes centered or bikes occupied which results in an unknown state.
 				Log.ForContext<SelectStationPageViewModel>().Error("No bikes available to determine pins color.");
 				return new List<Color>(stationsId.Select(x => Color.Blue));
 			}
diff --git a/TINKLib/ViewModel/FeesAndBikes/FeesAndBikesPageViewModel.cs b/TINKLib/ViewModel/FeesAndBikes/FeesAndBikesPageViewModel.cs
index 3a70965..180866c 100644
--- a/TINKLib/ViewModel/FeesAndBikes/FeesAndBikesPageViewModel.cs
+++ b/TINKLib/ViewModel/FeesAndBikes/FeesAndBikesPageViewModel.cs
@@ -52,7 +52,7 @@ namespace TINK.ViewModel.Contact
 		}
 
 		/// <summary>
-		/// Object to querry resources urls object from backend if required.
+		/// Object to query resources urls object from backend if required.
 		/// This object is used to update resources path values <see cref="FeesResourcePath"/>, and <see cref="BikesResourcePath"/> from.
 		/// </summary>
 		private Func<IQuery> QueryProvider { get; }
@@ -65,7 +65,7 @@ namespace TINK.ViewModel.Contact
 		/// <summary> Constructs view model.</summary>
 		/// <param name="isSiteCachingOn">Set of user permissions</param>
 		/// <param name="resourceProvider">Delegate to get an an embedded html ressource. Used as fallback if download from web page does not work and cache is empty.</param>
-		/// <param name="query">Object to querry resources path values if required.</param>
+		/// <param name="query">Object to query resources path values if required.</param>
 		public FeesAndBikesPageViewModel(
 			string hostName,
 			string feesResourcePath,
diff --git a/TINKLib/ViewModel/FindBike/FindBikePageViewModel.cs b/TINKLib/ViewModel/FindBike/FindBikePageViewModel.cs
index 5257b09..c7a192d 100644
--- a/TINKLib/ViewModel/FindBike/FindBikePageViewModel.cs
+++ b/TINKLib/ViewModel/FindBike/FindBikePageViewModel.cs
@@ -14,7 +14,7 @@ using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
 using TINK.Model.Connector;
 using TINK.Model.Device;
 using TINK.Model.Services.CopriApi;
-using TINK.Model.Station;
+using TINK.Model.Stations.StationNS;
 using TINK.Model.User;
 using TINK.MultilingualResources;
 using TINK.Repository.Exception;
@@ -105,17 +105,17 @@ namespace TINK.ViewModel.FindBike
 		/// </summary>
 		/// <param name="p_oUser">Mail address of active user.</param>
 		/// <param name="isReportLevelVerbose">True if report level is verbose, false if not.</param>
-		/// <param name="permissions">Holds object to query location permisions.</param>
+		/// <param name="permissions">Holds object to query location permissions.</param>
 		/// <param name="bluetoothLE">Holds object to query bluetooth state.</param>
 		/// <param name="runtimPlatform">Specifies on which platform code is run.</param>
 		/// <param name="isConnectedDelegate">Returns if mobile is connected to web or not.</param>
 		/// <param name="connectorFactory">Connects system to copri.</param>
 		/// <param name="lockService">Service to control lock retrieve info.</param>
 		/// <param name="stations">Stations to get station name from station id.</param>
-		/// <param name="polling"> Holds whether to poll or not and the periode leght is polling is on. </param>
+		/// <param name="polling"> Holds whether to poll or not and the period length is polling is on. </param>
 		/// <param name="postAction">Executes actions on GUI thread.</param>
 		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...).</param>
-		/// <param name="viewService">Interface to actuate methodes on GUI.</param>
+		/// <param name="viewService">Interface to actuate methods on GUI.</param>
 		/// <param name="openUrlInBrowser">Delegate to open browser.</param>
 		public FindBikePageViewModel(
 			User p_oUser,
diff --git a/TINKLib/ViewModel/Info/BikeInfo/BikeInfoCarouselViewModel.cs b/TINKLib/ViewModel/Info/BikeInfo/BikeInfoCarouselViewModel.cs
index 850bd65..4355162 100644
--- a/TINKLib/ViewModel/Info/BikeInfo/BikeInfoCarouselViewModel.cs
+++ b/TINKLib/ViewModel/Info/BikeInfo/BikeInfoCarouselViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using TINK.View;
 using Xamarin.Forms;
@@ -13,7 +13,7 @@ namespace TINK.ViewModel.Info.BikeInfo
 		private readonly IViewService m_oViewService;
 
 
-		/// <param name="p_oViewService">Interface to actuate methodes on GUI.</param>
+		/// <param name="p_oViewService">Interface to actuate methods on GUI.</param>
 		public BikeInfoViewModel(Func<string, ImageSource> imageSourceFunc, IViewService p_oViewService)
 		{
 			m_oViewService = p_oViewService
diff --git a/TINKLib/ViewModel/Info/InfoPageViewModel.cs b/TINKLib/ViewModel/Info/InfoPageViewModel.cs
index 2bda980..95c83d1 100644
--- a/TINKLib/ViewModel/Info/InfoPageViewModel.cs
+++ b/TINKLib/ViewModel/Info/InfoPageViewModel.cs
@@ -62,7 +62,7 @@ namespace TINK.ViewModel.Info
 		}
 
 		/// <summary>
-		/// Object to querry resources urls object from backend if required.
+		/// Object to query resources urls object from backend if required.
 		/// This object is used to update resources path values <see cref="AgbResourcePath"/>, <see cref="PrivacyResourcePath"/> and <see cref="ImpressResourcePath"/> from.
 		/// </summary>
 		private Func<IQuery> QueryProvider { get; }
@@ -79,7 +79,7 @@ namespace TINK.ViewModel.Info
 		/// <param name="privacyResourcePath"> Privacy resouce path received from backend.</param>
 		/// <param name="impressResourcePath"> Impress resouce path received from backend.</param>
 		/// <param name="resourceProvider">Delegate to get an an embedded html ressource. Used as fallback if download from web page does not work and cache is empty.</param>
-		/// <param name="queryProvider">Object to querry resources urls object from backend if required.</param>
+		/// <param name="queryProvider">Object to query resources urls object from backend if required.</param>
 		/// <param name="updateUrlsAction">Action to update shared resources urls object</param>
 		public InfoPageViewModel(
 			string hostName,
@@ -102,7 +102,7 @@ namespace TINK.ViewModel.Info
 			InfoAgb = new HtmlWebViewSource { Html = "<html>Loading...</html>" };
 
 			ResourceProvider = resourceProvider
-				?? throw new ArgumentException($"Can not instantiate {typeof(InfoPageViewModel)}-object. No ressource provider availalbe.");
+				?? throw new ArgumentException($"Can not instantiate {typeof(InfoPageViewModel)}-object. No ressource provider centered.");
 		}
 
 		/// <summary> Called when page is shown. </summary>
diff --git a/TINKLib/ViewModel/Login/LoginPageViewModel.cs b/TINKLib/ViewModel/Login/LoginPageViewModel.cs
index d07427a..0af17b9 100644
--- a/TINKLib/ViewModel/Login/LoginPageViewModel.cs
+++ b/TINKLib/ViewModel/Login/LoginPageViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
@@ -57,7 +57,7 @@ namespace TINK.ViewModel
 		/// <param name="p_oSetCredentials">Delegate to set new mail address and password to model.</param>
 		/// <param name="p_oUser">Mail address of user if login succeeded.</param>
 		/// <param name="openUrlInExternalBrowser">Action to open an external browser.</param>
-		/// <param name="p_oViewService">Interface to actuate methodes on GUI.</param>
+		/// <param name="p_oViewService">Interface to actuate methods on GUI.</param>
 		/// <param name="p_oNavigation">Interface to navigate.</param>
 		public LoginPageViewModel(
 			ITinkApp tinkApp,
diff --git a/TINKLib/ViewModel/Map/MapPageViewModel.cs b/TINKLib/ViewModel/Map/MapPageViewModel.cs
index 8be95a0..640a6ed 100644
--- a/TINKLib/ViewModel/Map/MapPageViewModel.cs
+++ b/TINKLib/ViewModel/Map/MapPageViewModel.cs
@@ -1,6 +1,6 @@
 using Xamarin.Forms;
 using TINK.View;
-using TINK.Model.Station;
+using TINK.Model.Stations;
 using System;
 using System.Linq;
 using TINK.Model.Bikes;
@@ -39,7 +39,7 @@ namespace TINK.ViewModel.Map
 		private static bool WasMerchantMessageAlreadyShown { get; set; } = false;
 
 
-		/// <summary> Holds the count of custom icons availalbe.</summary>
+		/// <summary> Holds the count of custom icons centered.</summary>
 		private const int CUSTOM_ICONS_COUNT = 30;
 
 		/// <summary> Reference on view service to show modal notifications and to perform navigation. </summary>
@@ -67,7 +67,7 @@ namespace TINK.ViewModel.Map
 		/// <summary> Object to manage update of view model objects from Copri.</summary>
 		private IPollingUpdateTaskManager m_oViewUpdateManager;
 
-		/// <summary>Holds whether to poll or not and the periode leght is polling is on.</summary>
+		/// <summary>Holds whether to poll or not and the period length is polling is on.</summary>
 		private PollingParameters Polling { get; set; }
 
 		/// <summary> Reference on the tink app instance. </summary>
@@ -228,8 +228,8 @@ namespace TINK.ViewModel.Map
 			{
 				if (station.Position == null)
 				{
-					// There should be no reason for a position object to be null but this alreay occurred in past.
-					Log.ForContext<MapPageViewModel>().Error("Postion object of station {@l_oStation} is null.", station);
+					// There should be no reason for a position object to be null but this already occurred in past.
+					Log.ForContext<MapPageViewModel>().Error("Position object of station {@l_oStation} is null.", station);
 					continue;
 				}
 
@@ -355,7 +355,7 @@ namespace TINK.ViewModel.Map
 				Polling = TinkApp.Polling;
 
 				Log.ForContext<MapPageViewModel>().Information(
-					$"{(Polling != null && Polling.IsActivated ? $"Map page is appearing. Update periode is {Polling.Periode.TotalSeconds} sec." : "Map page is appearing. Polling is off.")}" +
+					$"{(Polling != null && Polling.IsActivated ? $"Map page is appearing. Update period is {Polling.Periode.TotalSeconds} sec." : "Map page is appearing. Polling is off.")}" +
 					$"Current UI language is {Thread.CurrentThread.CurrentUICulture.Name}.");
 
 				// Update map page filter
@@ -516,13 +516,13 @@ namespace TINK.ViewModel.Map
 			if (Pins.Count > 0 && Pins.Count != stations.Count)
 			{
 				// Either
-				// - user logged in/ logged out which might lead to more/ less stations beeing available
+				// - user logged in/ logged out which might lead to more/ less stations being available
 				// - new stations were added/ existing ones remove
 				Pins.Clear();
 			}
 
-			// Check if there are alreay any pins to the map
-			// i.e detecte first call of member OnAppearing after construction
+			// Check if there are already any pins to the map
+			// i.e detects first call of member OnAppearing after construction
 			if (Pins.Count <= 0)
 			{
 				Log.ForContext<MapPageViewModel>().Debug($"{(ActiveFilterMap.GetGroup().Any() ? $"Active map filter is {string.Join(",", ActiveFilterMap.GetGroup())}." : "Map filter is off.")}");
@@ -657,8 +657,8 @@ namespace TINK.ViewModel.Map
 						// Load MyBikes Count -> MyBikes Icon/Button
 						GetMyBikesCount(resultStationsAndBikes.Response.Bikes);
 
-						// Check if there are alreay any pins to the map. 
-						// If no initialze pins.
+						// Check if there are already any pins to the map. 
+						// If no initialize pins.
 						if (Pins.Count <= 0)
 						{
 							// Set pins to their positions on map.
@@ -725,7 +725,7 @@ namespace TINK.ViewModel.Map
 				IsMapPageEnabled = false;
 
 				TinkApp.SelectedStation = TinkApp.Stations.FirstOrDefault(x => x.Id == selectedStationId)
-				?? new Station(selectedStationId, new List<string>(), null); // Station might not be in list StationDictinaly because this list is not updatd in background task.
+				?? new Model.Stations.StationNS.Station(selectedStationId, new List<string>(), null); // Station might not be in list StationDictinaly because this list is not updated in background task.
 
 #if TRYNOTBACKSTYLE
                 m_oNavigation.ShowPage(
@@ -771,7 +771,7 @@ namespace TINK.ViewModel.Map
 
 			if (bikesAll == null)
 			{
-				// If object is null an error occurred querrying bikes availalbe or bikes occpied which results in an unknown state.
+				// If object is null an error occurred querying bikes centered or bikes occupied which results in an unknown state.
 				Log.ForContext<MapPageViewModel>().Error("No bikes available to determine pins color.");
 				return new List<Color>(stationsId.Select(x => Color.Blue));
 			}
diff --git a/TINKLib/ViewModel/MiniSurvey/MiniSurveyViewModel.cs b/TINKLib/ViewModel/MiniSurvey/MiniSurveyViewModel.cs
index cab4e4f..d1b75a8 100644
--- a/TINKLib/ViewModel/MiniSurvey/MiniSurveyViewModel.cs
+++ b/TINKLib/ViewModel/MiniSurvey/MiniSurveyViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -29,7 +29,7 @@ namespace TINK.ViewModel.MiniSurvey
 
 		/// <summary> Constructs mini survey view model.</summary>
 		/// <param name="connectorFactory">Connects system to copri for purposes of requesting a bike/ cancel request.</param>
-		/// <param name="viewService">Interface to actuate methodes on GUI.</param>
+		/// <param name="viewService">Interface to actuate methods on GUI.</param>
 		public MiniSurveyViewModel(
 			Func<bool> isConnectedDelegate,
 			Func<bool, IConnector> connectorFactory,
diff --git a/TINKLib/ViewModel/MyBikes/MyBikeViewModel.cs b/TINKLib/ViewModel/MyBikes/MyBikeViewModel.cs
index 2ec5a86..1186fac 100644
--- a/TINKLib/ViewModel/MyBikes/MyBikeViewModel.cs
+++ b/TINKLib/ViewModel/MyBikes/MyBikeViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using TINK.Model.State;
 using TINK.MultilingualResources;
 using TINK.ViewModel.Bikes.Bike;
@@ -23,7 +23,7 @@ namespace TINK.ViewModel
 
 					if (string.IsNullOrEmpty(code))
 					{
-						// Code is not avilable
+						// Code is not available
 						return string.Format(AppResources.StatusTextReservationExpiredMaximumReservationTime, StateRequestedInfo.MaximumReserveTime.Minutes);
 					}
 
diff --git a/TINKLib/ViewModel/MyBikes/MyBikesPageViewModel.cs b/TINKLib/ViewModel/MyBikes/MyBikesPageViewModel.cs
index 04b0363..52b7c7c 100644
--- a/TINKLib/ViewModel/MyBikes/MyBikesPageViewModel.cs
+++ b/TINKLib/ViewModel/MyBikes/MyBikesPageViewModel.cs
@@ -12,7 +12,7 @@ using TINK.Model.Bikes;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
 using TINK.Model.Connector;
 using TINK.Model.Device;
-using TINK.Model.Station;
+using TINK.Model.Stations.StationNS;
 using TINK.Model.User;
 using TINK.MultilingualResources;
 using TINK.Services.BluetoothLock;
@@ -57,17 +57,17 @@ namespace TINK.ViewModel.MyBikes
 		/// </summary>
 		/// <param name="p_oUser">Mail address of active user.</param>
 		/// <param name="isReportLevelVerbose">True if report level is verbose, false if not.</param>
-		/// <param name="permissions">Holds object to query location permisions.</param>
+		/// <param name="permissions">Holds object to query location permissions.</param>
 		/// <param name="bluetoothLE">Holds object to query bluetooth state.</param>
 		/// <param name="runtimPlatform">Specifies on which platform code is run.</param>
 		/// <param name="isConnectedDelegate">Returns if mobile is connected to web or not.</param>
 		/// <param name="connectorFactory">Connects system to copri.</param>
 		/// <param name="lockService">Service to control lock retrieve info.</param>
 		/// <param name="stations">Stations to get station name from station id.</param>
-		/// <param name="p_oPolling"> Holds whether to poll or not and the periode leght is polling is on. </param>
+		/// <param name="p_oPolling"> Holds whether to poll or not and the period length is polling is on. </param>
 		/// <param name="postAction">Executes actions on GUI thread.</param>
 		/// <param name="smartDevice">Provides info about the smart device (phone, tablet, ...).</param>
-		/// <param name="viewService">Interface to actuate methodes on GUI.</param>
+		/// <param name="viewService">Interface to actuate methods on GUI.</param>
 		/// <param name="openUrlInBrowser">Delegate to open browser.</param>
 		public MyBikesPageViewModel(
 			User p_oUser,
diff --git a/TINKLib/ViewModel/PollingUpdateTask.cs b/TINKLib/ViewModel/PollingUpdateTask.cs
index 1c54c6b..5975e6e 100644
--- a/TINKLib/ViewModel/PollingUpdateTask.cs
+++ b/TINKLib/ViewModel/PollingUpdateTask.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -23,7 +23,7 @@ namespace TINK.ViewModel
 
 		/// <summary> Obects which does a periodic update. </summary>
 		/// <param name="updateAction">Update action to perform.</param>
-		/// <param name="polling"> Holds whether to poll or not and the periode leght is polling is on. </param>
+		/// <param name="polling"> Holds whether to poll or not and the period length is polling is on. </param>
 		public PollingUpdateTask(
 			Action updateAction,
 			TimeSpan? polling)
diff --git a/TINKLib/ViewModel/PollingUpdateTaskManager.cs b/TINKLib/ViewModel/PollingUpdateTaskManager.cs
index 0f28dab..ab8887f 100644
--- a/TINKLib/ViewModel/PollingUpdateTaskManager.cs
+++ b/TINKLib/ViewModel/PollingUpdateTaskManager.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Serilog;
 using TINK.Settings;
@@ -39,7 +39,7 @@ namespace TINK.ViewModel
 		/// Invoked when page is shown. 
 		/// Actuates and awaits the first update process and starts a task wich actuate the subseqent update tasks.
 		/// </summary>
-		/// <param name="pollingParameters">Parametes holding polling periode, if null last parameters are used if available.</param>
+		/// <param name="pollingParameters">Parametes holding polling period, if null last parameters are used if available.</param>
 		public async Task StartUpdateAyncPeridically(PollingParameters pollingParameters = null)
 		{
 			if (UpdateTask != null)
diff --git a/TINKLib/ViewModel/Settings/FilterItemMutable.cs b/TINKLib/ViewModel/Settings/FilterItemMutable.cs
index 42ebae5..cd2477a 100644
--- a/TINKLib/ViewModel/Settings/FilterItemMutable.cs
+++ b/TINKLib/ViewModel/Settings/FilterItemMutable.cs
@@ -3,7 +3,7 @@ using TINK.Model;
 
 namespace TINK.ViewModel.Settings
 {
-	/// <summary>Holds filter item incluting full state (avaialble, activated, name, ...). </summary>
+	/// <summary>Holds filter item including full state (available, activated, name, ...). </summary>
 	public class FilterItemMutable : INotifyPropertyChanged
 	{
 		public event PropertyChangedEventHandler PropertyChanged;
@@ -32,7 +32,7 @@ namespace TINK.ViewModel.Settings
 		/// <summary> Text describing the filter. </summary>
 		public string Text { get; }
 
-		/// <summary> True if switch can be toggeled.</summary>
+		/// <summary> True if switch can be toggled.</summary>
 		public bool IsEnabled { get; }
 
 		/// <summary> True if switch is on.</summary>
diff --git a/TINKLib/ViewModel/Settings/PollingViewModel.cs b/TINKLib/ViewModel/Settings/PollingViewModel.cs
index e1cf6a9..6e7ed9a 100644
--- a/TINKLib/ViewModel/Settings/PollingViewModel.cs
+++ b/TINKLib/ViewModel/Settings/PollingViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel;
 using TINK.Settings;
 
@@ -10,7 +10,7 @@ namespace TINK.ViewModel.Settings
 		/// <summary>Holds the views polling parameters.</summary>
 		private PollingParameters m_oPolling = PollingParameters.Default;
 
-		/// <summary> Current polling periode. Used to check whether values were modified or not.</summary>
+		/// <summary> Current polling period. Used to check whether values were modified or not.</summary>
 		private readonly PollingParameters m_oPollingActive;
 
 		/// <summary> Constructs polling object. </summary>
@@ -52,7 +52,7 @@ namespace TINK.ViewModel.Settings
 			}
 		}
 
-		/// <summary> Gests or sets the polling periode [sec]. </summary>
+		/// <summary> Gests or sets the polling period [sec]. </summary>
 		public int PeriodeTotalSeconds
 		{
 			get
@@ -76,7 +76,7 @@ namespace TINK.ViewModel.Settings
 			}
 		}
 
-		/// <summary> Gets info about polling periode.</summary>
+		/// <summary> Gets info about polling period.</summary>
 		public string PeriodeTotalSecondsText
 		{
 			get
diff --git a/TINKLib/ViewModel/Settings/SettingsPageViewModel.cs b/TINKLib/ViewModel/Settings/SettingsPageViewModel.cs
index 4ffc658..a2b314c 100644
--- a/TINKLib/ViewModel/Settings/SettingsPageViewModel.cs
+++ b/TINKLib/ViewModel/Settings/SettingsPageViewModel.cs
@@ -356,7 +356,7 @@ namespace TINK.ViewModel
 		/// <summary> Empty if no user is logged in session cookie otherwise. </summary>
 		public string SessionCookie => TinkApp.ActiveUser.IsLoggedIn ? TinkApp.ActiveUser.SessionCookie : "";
 
-		/// <summary>Polling periode.</summary>
+		/// <summary>Polling period.</summary>
 		public PollingViewModel Polling { get; }
 
 		/// <summary> Active logging level</summary>
diff --git a/TINKLib/ViewModel/ViewModelHelper.cs b/TINKLib/ViewModel/ViewModelHelper.cs
index 6ba56dc..913c8c8 100644
--- a/TINKLib/ViewModel/ViewModelHelper.cs
+++ b/TINKLib/ViewModel/ViewModelHelper.cs
@@ -7,7 +7,7 @@ using Serilog;
 using TINK.Model.Bikes.BikeInfoNS.BC;
 using TINK.Model.Device;
 using TINK.Model.State;
-using TINK.Model.Station;
+using TINK.Model.Stations.StationNS;
 using TINK.Model.User;
 using TINK.MultilingualResources;
 using TINK.Repository;
diff --git a/TINKLib/ViewModel/WhatsNew/Agb/AgbViewModel.cs b/TINKLib/ViewModel/WhatsNew/Agb/AgbViewModel.cs
index 55a354d..d02dee5 100644
--- a/TINKLib/ViewModel/WhatsNew/Agb/AgbViewModel.cs
+++ b/TINKLib/ViewModel/WhatsNew/Agb/AgbViewModel.cs
@@ -37,7 +37,7 @@ namespace TINK.ViewModel.WhatsNew.Agb
 				?? throw new ArgumentException($"Can not instantiate {typeof(WhatsNewViewModel)}-object. No view available.");
 
 			ResourceProvider = resourceProvider
-				?? throw new ArgumentException($"Can not instantiate {typeof(WhatsNewViewModel)}-object. No ressource provider availalbe.");
+				?? throw new ArgumentException($"Can not instantiate {typeof(WhatsNewViewModel)}-object. No ressource provider centered.");
 		}
 
 		/// <summary> Gets the platfrom specific prefix. </summary>
diff --git a/TINKLib/ViewModel/WhatsNew/WhatsNewViewModel.cs b/TINKLib/ViewModel/WhatsNew/WhatsNewViewModel.cs
index b9b7e63..1401716 100644
--- a/TINKLib/ViewModel/WhatsNew/WhatsNewViewModel.cs
+++ b/TINKLib/ViewModel/WhatsNew/WhatsNewViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Input;
@@ -26,7 +26,7 @@ namespace TINK.ViewModel.WhatsNew
 			   ?? throw new ArgumentException($"Can not instantiate {typeof(WhatsNewViewModel)}-object. No view available.");
 
 			ShowMasterDetail = showMasterDetail
-				?? throw new ArgumentException($"Can not instantiate {typeof(WhatsNewViewModel)}-object. No delegate to activated maste detail page avilable.");
+				?? throw new ArgumentException($"Can not instantiate {typeof(WhatsNewViewModel)}-object. No delegate to activated maste detail page available.");
 
 			CurrentVersion = currentVersion;
 			WhatsNewText = new FormattedString();
diff --git a/TestFramework/Repository/CopriCallMemoryBase.cs b/TestFramework/Repository/CopriCallMemoryBase.cs
index 03d66eb..9505617 100644
--- a/TestFramework/Repository/CopriCallMemoryBase.cs
+++ b/TestFramework/Repository/CopriCallMemoryBase.cs
@@ -6,10 +6,10 @@ using System.Threading.Tasks;
 using TINK.Model;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
 using TINK.Model.Connector;
-using TINK.Model.Device;
 using TINK.Repository;
 using TINK.Repository.Request;
 using TINK.Repository.Response;
+using TINK.Repository.Response.Stations;
 
 namespace TestFramework.Repository
 {
@@ -42,7 +42,8 @@ namespace TestFramework.Repository
 		/// <param name="stationsResponseResource"></param>
 		/// <param name="bookingRequestResponseResource"></param>
 		/// <param name="cancelBookingRequestResponseResource"></param>
-		/// <param name="sessionCookie"></param>
+		/// <param name="sessionCookie">Session cookie.</param>
+		/// <param name="merchantId">Merchant identifier.</param>
 		public CopriCallMemoryBase(
 			string bikesAvailableResponseResource = null,
 			string bikesOccupiedResponseResoure = null,
@@ -51,7 +52,8 @@ namespace TestFramework.Repository
 			string stationsResponseResource = null,
 			string bookingRequestResponseResource = null,
 			string cancelBookingRequestResponseResource = null,
-			string sessionCookie = null)
+			string sessionCookie = null,
+			string merchantId = null)
 		{
 			string ReadResource(string resourceName)
 			{
@@ -64,6 +66,8 @@ namespace TestFramework.Repository
 				}
 			}
 
+			MerchantId = merchantId ?? TinkApp.MerchantId;
+
 			SessionCookie = sessionCookie;
 
 			BikesAvailableResponse = ReadResource(bikesAvailableResponseResource);
@@ -75,8 +79,8 @@ namespace TestFramework.Repository
 			CancelBookingRequestResponse = ReadResource(cancelBookingRequestResponseResource);
 
 			requestBuilder = string.IsNullOrEmpty(sessionCookie)
-				? new RequestBuilder(MerchantId, null /*UI language */) as IRequestBuilder
-				: new RequestBuilderLoggedIn(MerchantId, null /*UI language */, sessionCookie);
+				? new RequestBuilder(merchantId ?? MerchantId, null /*UI language */) as IRequestBuilder
+				: new RequestBuilderLoggedIn(merchantId ?? MerchantId, null /*UI language */, sessionCookie);
 		}
 
 		/// <summary> Holds the session id of the logged in user, null otherwise. </summary>
@@ -85,7 +89,7 @@ namespace TestFramework.Repository
 		/// <summary> Logs user in. </summary>
 		/// <param name="p_oUser">User to log in.</param>
 		/// <param name="deviceId">Id specifying user and hardware.</param>
-		/// <param name="mailAddress">Mailaddress of user to log in.</param>
+		/// <param name="mailAddress">Mail address of user to log in.</param>
 		/// <param name="password">Password to log in.</param>
 		/// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
 		public async Task<AuthorizationResponse> DoAuthorizationAsync(
@@ -108,7 +112,7 @@ namespace TestFramework.Repository
 			=> await Task.Run(() => GetBikesAvailable(BikesAvailableResponse, null, SessionCookie));
 
 		/// <summary>
-		/// Gets a list of bikes reserved/ booked by acctive user from Copri.
+		/// Gets a list of bikes reserved/ booked by active user from Copri.
 		/// </summary>
 		/// <param name="p_strSessionCookie">Cookie to authenticate user.</param>
 		/// <returns>Response holding list of bikes.</returns>
@@ -116,7 +120,7 @@ namespace TestFramework.Repository
 		{
 			try
 			{
-				requestBuilder.GetBikesOccupied(); // Non mock implementation if ICopriServer call this member as well. To ensure comparable behaviour this member is called here as well.
+				requestBuilder.GetBikesOccupied(); // Non mock implementation if ICopriServer call this member as well. To ensure comparable behavior this member is called here as well.
 			}
 			catch (NotSupportedException)
 			{
@@ -144,7 +148,7 @@ namespace TestFramework.Repository
 			=> await Task.Run(() => DoReserve(BookingRequestResponse, bikeId, SessionCookie));
 
 		/// <summary>
-		/// Gets canel booking request response.
+		/// Gets cancel booking request response.
 		/// </summary>
 		/// <param name="bikeId">Id of the bike to book.</param>
 		/// <param name="cookie">Cookie of the logged in user.</param>
@@ -154,14 +158,14 @@ namespace TestFramework.Repository
 
 
 		/// <summary> Gets the merchant id.</summary>
-		public string MerchantId => TinkApp.MerchantId;
+		public string MerchantId { get; }
 
 		/// <summary> Returns false because cached values are returned. </summary>
 		public bool IsConnected => false;
 
 		/// <summary> Logs user in. </summary>
 		/// <param name="deviceId">Id specifying user and hardware.</param>
-		/// <param name="mailAddress">Mailaddress of user to log in.</param>
+		/// <param name="mailAddress">Mail address of user to log in.</param>
 		/// <param name="password">Password to log in.</param>
 		/// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
 		public static AuthorizationResponse DoAuthorize(
@@ -236,7 +240,7 @@ namespace TestFramework.Repository
 			=> JsonConvertRethrow.DeserializeObject<ResponseContainer<ReservationBookingResponse>>(bookingRequestResponse).shareejson;
 
 		/// <summary>
-		/// Gets canel booking request response.
+		/// Gets cancel booking request response.
 		/// </summary>
 		/// <param name="bikeId">Id of the bike to book.</param>
 		/// <param name="cookie">Cookie of the logged in user.</param>
@@ -292,7 +296,7 @@ namespace TestFramework.Repository
 			=> null;
 
 		/// <summary>
-		/// Gets a list of bikes reserved/ booked by acctive user from Copri.
+		/// Gets a list of bikes reserved/ booked by active user from Copri.
 		/// </summary>
 		/// <param name="sessionCookie">Cookie to authenticate user.</param>
 		/// <param name="SampleSet">Sample set to use.</param>
diff --git a/TestFramework/Repository/CopriCallsMemory001.cs b/TestFramework/Repository/CopriCallsMemory001.cs
index 40acd09..d2821c9 100644
--- a/TestFramework/Repository/CopriCallsMemory001.cs
+++ b/TestFramework/Repository/CopriCallsMemory001.cs
@@ -1,21 +1,24 @@
-using TINK.Repository;
+using TINK.Repository;
 
 namespace TestFramework.Repository
 {
 	/// <summary> 
 	/// Holds some COPRI responses for testing purposes.
 	/// </summary>
-	/// <remarks> Holds some demo Meinkonrad and LastenradBayern bikes
+	/// <remarks> Holds some demo Mein konrad and LastenradBayern bikes
 	/// </remarks>
 	public class CopriCallsMemory001 : CopriCallMemoryBase, ICopriServer
 	{
-		public CopriCallsMemory001(string sessionCookie = null) : base(
+		/// <param name="sessionCookie">Session cookie.</param>
+		/// <param name="merchantId">Merchant identifier.</param>
+		public CopriCallsMemory001(string sessionCookie = null, string merchantId = null) : base(
 			bikesAvailableResponseResource: "TestFramework.Repository.CopriCallsMemory001.BikesAvailableResponse.json",
 			bikesOccupiedResponseResoure: "TestFramework.Repository.CopriCallsMemory001.BikesOccupiedResponse.json",
 			authResponseResource: "TestFramework.Repository.CopriCallsMemory001.AuthorizationResponse.json",
 			authOutResponseResource: "TestFramework.Repository.CopriCallsMemory001.AuthoutResponse.json",
 			stationsResponseResource: "TestFramework.Repository.CopriCallsMemory001.StationsAvailable.json",
-			sessionCookie: sessionCookie)
+			sessionCookie: sessionCookie,
+			merchantId: merchantId)
 		{ }
 	}
-}
\ No newline at end of file
+}
diff --git a/TestFramework/Repository/ExceptionServer.cs b/TestFramework/Repository/ExceptionServer.cs
index 71f2429..9ebf229 100644
--- a/TestFramework/Repository/ExceptionServer.cs
+++ b/TestFramework/Repository/ExceptionServer.cs
@@ -7,6 +7,7 @@ using TINK.Model.Device;
 using TINK.Repository;
 using TINK.Repository.Request;
 using TINK.Repository.Response;
+using TINK.Repository.Response.Stations;
 
 namespace TestFramework.Repository
 {
@@ -16,7 +17,7 @@ namespace TestFramework.Repository
 		private Func<string, Exception> ExceptionFactory { get; }
 
 		/// <summary> Constructs object.</summary>
-		/// <param name="exceptionFactory"> Provides exceptions which are thrown whenn querrying information from server.</param>
+		/// <param name="exceptionFactory"> Provides exceptions which are thrown when querying information from server.</param>
 		public ExceptionServer(Func<string, Exception> exceptionFactory)
 		{
 			ExceptionFactory = exceptionFactory;
diff --git a/TestFramework/Services/BluetoothLock/LocksServiceMock.cs b/TestFramework/Services/BluetoothLock/LocksServiceMock.cs
index f27670b..b062ac4 100644
--- a/TestFramework/Services/BluetoothLock/LocksServiceMock.cs
+++ b/TestFramework/Services/BluetoothLock/LocksServiceMock.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using TINK.Model.Bikes;
@@ -16,7 +16,7 @@ namespace TestFramework.Services.BluetoothLock
 			return await Task.FromResult(new List<LockInfoTdo>());
 		}
 
-		/// <summary> Holds timeout values for series of connecting attemps to a lock or multiple locks. </summary>
+		/// <summary> Holds timeout values for series of connecting attempts to a lock or multiple locks. </summary>
 		public ITimeOutProvider TimeOut { get; set; }
 
 		public void UpdateSimulation(BikeCollection bikes) { }
diff --git a/TestFramework/Services/CopriApi/CopriCallsCacheMemory.cs b/TestFramework/Services/CopriApi/CopriCallsCacheMemory.cs
index 47bf719..0c995cb 100644
--- a/TestFramework/Services/CopriApi/CopriCallsCacheMemory.cs
+++ b/TestFramework/Services/CopriApi/CopriCallsCacheMemory.cs
@@ -8,11 +8,12 @@ using TINK.Model.Services.CopriApi;
 using TINK.Repository;
 using TINK.Repository.Request;
 using TINK.Repository.Response;
+using TINK.Repository.Response.Stations;
 using static TINK.Repository.CopriCallsMemory;
 
 namespace TestTINKLib.Mocks.Connector
 {
-	/// <summary> Allows use of memory for retrieving defined respones.</summary>
+	/// <summary> Allows use of memory for retrieving defined responses.</summary>
 	public class CopriCallsCacheMemory : ICopriCache
 	{
 		private CopriCallsMemory server;
diff --git a/TestFramework/Services/CopriApi/CopriCallsCacheMemory001.cs b/TestFramework/Services/CopriApi/CopriCallsCacheMemory001.cs
index f84ed67..08b9656 100644
--- a/TestFramework/Services/CopriApi/CopriCallsCacheMemory001.cs
+++ b/TestFramework/Services/CopriApi/CopriCallsCacheMemory001.cs
@@ -7,10 +7,11 @@ using TINK.Model.Connector;
 using TINK.Model.Services.CopriApi;
 using TINK.Repository.Request;
 using TINK.Repository.Response;
+using TINK.Repository.Response.Stations;
 
 namespace TestFramework.Services.CopriApi.Connector
 {
-	/// <summary> Allows use of memory for retrieving defined respones.</summary>
+	/// <summary> Allows use of memory for retrieving defined responses.</summary>
 	public class CopriCallsCacheMemory001 : ICopriCache
 	{
 		private CopriCallsMemory001 server;
diff --git a/TestLockItBLE/TestLockItBLE.csproj b/TestLockItBLE/TestLockItBLE.csproj
index 73c0822..2d40a1d 100644
--- a/TestLockItBLE/TestLockItBLE.csproj
+++ b/TestLockItBLE/TestLockItBLE.csproj
@@ -10,6 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="NSubstitute" Version="5.0.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
diff --git a/TestLockItShared/TestLockItShared.csproj b/TestLockItShared/TestLockItShared.csproj
index be93a72..bb28b67 100644
--- a/TestLockItShared/TestLockItShared.csproj
+++ b/TestLockItShared/TestLockItShared.csproj
@@ -12,6 +12,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="nunit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
diff --git a/TestSharee/TestSharee.csproj b/TestSharee/TestSharee.csproj
index cc49bdd..8cd6f6c 100644
--- a/TestSharee/TestSharee.csproj
+++ b/TestSharee/TestSharee.csproj
@@ -14,6 +14,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="NSubstitute" Version="5.0.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
   </ItemGroup>
diff --git a/TestSharee/UseCase/Startup/TestTinkApp.cs b/TestSharee/UseCase/Startup/TestTinkApp.cs
index ca1e220..838502f 100644
--- a/TestSharee/UseCase/Startup/TestTinkApp.cs
+++ b/TestSharee/UseCase/Startup/TestTinkApp.cs
@@ -1,10 +1,10 @@
-using NUnit.Framework;
+using NUnit.Framework;
 using TINK.Model;
 
 using TINK.Model.User.Account;
 using TINK.Model.Connector;
 using System;
-using TINK.Model.Station;
+using TINK.Model.Stations;
 using static TINK.Repository.CopriCallsMemory;
 using TINK.Model.State;
 using System.Collections.Generic;
@@ -68,7 +68,7 @@ namespace TestShareeLib.UseCases.Startup
             Assert.AreEqual(
                 null,
                 l_oTinkApp.SelectedStation.Id,
-                "When starting app selected station must always be invlid");
+                "When starting app selected station must always be invalid");
 
             // Verify bikes at station.
             Assert.AreEqual(
@@ -121,7 +121,7 @@ namespace TestShareeLib.UseCases.Startup
             Assert.AreEqual(
                 null,
                 l_oTinkApp.SelectedStation.Id,
-                "When starting app selected station must always be invlid");
+                "When starting app selected station must always be invalid");
 
             // Verify bikes at station.
             Assert.AreEqual(
@@ -182,7 +182,7 @@ namespace TestShareeLib.UseCases.Startup
             Assert.AreEqual(
                 null,
                 l_oTinkApp.SelectedStation.Id,
-                "When starting app selected station must always be invlid");
+                "When starting app selected station must always be invalid");
 
             // Verify bikes at station.
             Assert.AreEqual(
@@ -237,7 +237,7 @@ namespace TestShareeLib.UseCases.Startup
             Assert.AreEqual(
                 null,
                 l_oTinkApp.SelectedStation.Id,
-                "When starting app selected station must always be invlid");
+                "When starting app selected station must always be invalid");
 
             // Verify bikes at station.
             Assert.AreEqual(
@@ -377,7 +377,7 @@ namespace TestShareeLib.UseCases.Startup
                 l_oTinkApp.WhatsNew.IsShowRequired,
                 $"Whats new should not be displayed because app version is {l_oAppVersion} and version when \"Whats New\" was shown last is {l_oWhatsNewVersion} equals.");
 
-            // Call member which view model would call if Whats New would have been shonw.
+            // Call member which view model would call if Whats New would have been shown.
             l_oTinkApp.SetWhatsNewWasShown();
 
             // Whats new page
diff --git a/TestShareeLib/Model/Bikes/BikeInfoNS/BC/TestBikeInfo.cs b/TestShareeLib/Model/Bikes/BikeInfoNS/BC/TestBikeInfo.cs
index 96fa65d..ab0eb9d 100644
--- a/TestShareeLib/Model/Bikes/BikeInfoNS/BC/TestBikeInfo.cs
+++ b/TestShareeLib/Model/Bikes/BikeInfoNS/BC/TestBikeInfo.cs
@@ -39,14 +39,6 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BC
 			}
 		}
 
-		[Test]
-		public void TestCtorCopyNull()
-		{
-			Assert.Throws<ArgumentNullException>(
-				() => new BikeInfo(null),
-				"Verify that no unspecific reference not set to... exception is thrown");
-		}
-
 		[Test]
 		public void TestCtorBikeNull()
 		{
@@ -62,13 +54,5 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BC
 				() => new TestBikeInfoSubClass(new StateInfo(), new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike(string.Empty, LockModel.ILockIt), null),
 				Throws.ArgumentNullException);
 		}
-
-		[Test]
-		public void TestCtorCopy()
-		{
-			Assert.That(
-				() => new BikeInfo(null),
-				Throws.ArgumentNullException);
-		}
 	}
 }
diff --git a/TestShareeLib/Model/Bikes/BikeInfoNS/BC/TestBikeInfoMutable.cs b/TestShareeLib/Model/Bikes/BikeInfoNS/BC/TestBikeInfoMutable.cs
index 672d4ee..20019cf 100644
--- a/TestShareeLib/Model/Bikes/BikeInfoNS/BC/TestBikeInfoMutable.cs
+++ b/TestShareeLib/Model/Bikes/BikeInfoNS/BC/TestBikeInfoMutable.cs
@@ -21,6 +21,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike
 				IEnumerable<string> group = null,
 				WheelType? wheelType = null,
 				TypeOfBike? typeOfBike = null,
+				AaRideType? aaRideType = null,
 				string description = null,
 				string stationId = null,
 				string stationName = null,
@@ -28,7 +29,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike
 				RentalDescription tariffDescription = null,
 				Func<DateTime> dateTimeProvider = null,
 				IStateInfo stateInfo = null) : base(
-					new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike(id, lockModel, wheelType, typeOfBike, description),
+					new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike(id, lockModel, wheelType, typeOfBike, aaRideType, description),
 					new TINK.Model.Bikes.BikeInfoNS.DriveNS.Drive(),
 					TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri,
 					isDemo,
@@ -53,7 +54,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike
 			Assert.AreEqual(null, l_oBikeInfo.WheelType);
 			Assert.AreEqual(null, l_oBikeInfo.TypeOfBike);
 
-			l_oBikeInfo = new BikeInfoMutable("22", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Trike, TypeOfBike.Cargo, "Test description", "23");
+			l_oBikeInfo = new BikeInfoMutable("22", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Trike, TypeOfBike.Cargo, AaRideType.NoAaRide, "Test description", "23");
 			Assert.AreEqual("22", l_oBikeInfo.Id);
 			Assert.IsFalse(l_oBikeInfo.IsDemo);
 			Assert.AreEqual("23", l_oBikeInfo.StationId);
@@ -61,93 +62,5 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike
 			Assert.AreEqual(WheelType.Trike, l_oBikeInfo.WheelType);
 			Assert.AreEqual(TypeOfBike.Cargo, l_oBikeInfo.TypeOfBike);
 		}
-
-
-		[Test]
-		public void TestConstructCopyBooked()
-		{
-			// State Booked
-			var bikeInfoSource = Substitute.For<IBikeInfo>();
-			var stateSource = Substitute.For<IStateInfo>();
-
-			bikeInfoSource.Bike.Returns(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.BordComputer, WheelType.Trike, TypeOfBike.Cargo));
-			bikeInfoSource.StationId.Returns("23");
-			bikeInfoSource.State.Returns(stateSource);
-			stateSource.Value.Returns(InUseStateEnum.Booked);
-			stateSource.From.Returns(new System.DateTime(2018, 01, 03));
-			stateSource.MailAddress.Returns("a@b");
-			stateSource.Code.Returns("234");
-
-			var bikeInfoTarget = new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable(bikeInfoSource, "My Station Name");
-
-			Assert.AreEqual(InUseStateEnum.Booked, bikeInfoTarget.State.Value);
-			Assert.AreEqual("22", bikeInfoTarget.Id);
-			Assert.AreEqual("23", bikeInfoTarget.StationId);
-			Assert.AreEqual("My Station Name", bikeInfoTarget.StationName);
-			Assert.AreEqual(WheelType.Trike, bikeInfoTarget.WheelType);
-			Assert.AreEqual(TypeOfBike.Cargo, bikeInfoTarget.TypeOfBike);
-			Assert.AreEqual(InUseStateEnum.Booked, bikeInfoTarget.State.Value);
-			Assert.AreEqual(new System.DateTime(2018, 01, 03), bikeInfoTarget.State.From);
-			Assert.AreEqual("a@b", bikeInfoTarget.State.MailAddress);
-		}
-
-		[Test]
-		public void TestConstructCopyReserved()
-		{
-			// State Reserved
-			var bikeInfoSource = Substitute.For<IBikeInfo>();
-			var stateSource = Substitute.For<IStateInfo>();
-
-			bikeInfoSource.Bike.Returns(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.BordComputer, WheelType.Trike, TypeOfBike.Cargo));
-			bikeInfoSource.StationId.Returns("23");
-			bikeInfoSource.State.Returns(stateSource);
-			stateSource.Value.Returns(InUseStateEnum.Reserved);
-			stateSource.From.Returns(new System.DateTime(2018, 01, 03));
-			stateSource.MailAddress.Returns("a@b");
-			stateSource.Code.Returns("234");
-
-			var bikeInfoTarget = new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable(bikeInfoSource, "My Station Name");
-
-			Assert.AreEqual(InUseStateEnum.Reserved, bikeInfoTarget.State.Value);
-			Assert.AreEqual("22", bikeInfoTarget.Id);
-			Assert.AreEqual("23", bikeInfoTarget.StationId);
-			Assert.AreEqual(WheelType.Trike, bikeInfoTarget.WheelType);
-			Assert.AreEqual(TypeOfBike.Cargo, bikeInfoTarget.TypeOfBike);
-			Assert.AreEqual(InUseStateEnum.Reserved, bikeInfoTarget.State.Value);
-			Assert.AreEqual(new System.DateTime(2018, 01, 03), bikeInfoTarget.State.From);
-			Assert.AreEqual("a@b", bikeInfoTarget.State.MailAddress);
-
-		}
-
-		[Test]
-		public void TestConstructCopyAvailable()
-		{
-			// State Disposable
-			var bikeInfoSource = Substitute.For<IBikeInfo>();
-			var stateSource = Substitute.For<IStateInfo>();
-
-			bikeInfoSource.Bike.Returns(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("22", LockModel.BordComputer, WheelType.Trike, TypeOfBike.Cargo));
-			bikeInfoSource.StationId.Returns("23");
-			bikeInfoSource.State.Returns(stateSource);
-			stateSource.Value.Returns(InUseStateEnum.Disposable);
-
-			var bikeInfoTarget = new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable(bikeInfoSource, "My Station Name");
-
-			Assert.AreEqual(InUseStateEnum.Disposable, bikeInfoTarget.State.Value);
-			Assert.AreEqual("22", bikeInfoTarget.Id);
-			Assert.AreEqual("23", bikeInfoTarget.StationId);
-			Assert.AreEqual(WheelType.Trike, bikeInfoTarget.WheelType);
-			Assert.AreEqual(TypeOfBike.Cargo, bikeInfoTarget.TypeOfBike);
-			Assert.AreEqual(InUseStateEnum.Disposable, bikeInfoTarget.State.Value);
-			Assert.IsNull(bikeInfoTarget.State.From);
-		}
-
-		[Test]
-		public void TestConstructBikeNull()
-		{
-			Assert.That(
-				() => new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable(null, "My Station Name"),
-				Throws.ArgumentNullException);
-		}
 	}
 }
diff --git a/TestShareeLib/Model/Bikes/BikeInfoNS/BC/TestBikeMutable.cs b/TestShareeLib/Model/Bikes/BikeInfoNS/BC/TestBikeMutable.cs
index 873aa2c..cef2fa9 100644
--- a/TestShareeLib/Model/Bikes/BikeInfoNS/BC/TestBikeMutable.cs
+++ b/TestShareeLib/Model/Bikes/BikeInfoNS/BC/TestBikeMutable.cs
@@ -19,6 +19,7 @@ namespace TestTINKLib
 				IEnumerable<string> group = null,
 				WheelType? wheelType = null,
 				TypeOfBike? typeOfBike = null,
+				AaRideType? aaRideType = null,
 				string description = null,
 				string stationId = null,
 				string stationName = null,
@@ -26,7 +27,7 @@ namespace TestTINKLib
 				RentalDescription tariffDescription = null,
 				Func<DateTime> dateTimeProvider = null,
 				IStateInfo stateInfo = null) : base(
-					new Bike(id, lockType, wheelType, typeOfBike, description),
+					new Bike(id, lockType, wheelType, typeOfBike, aaRideType, description),
 					new TINK.Model.Bikes.BikeInfoNS.DriveNS.Drive(),
 					TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri,
 					isDemo,
@@ -66,6 +67,7 @@ namespace TestTINKLib
 								new List<string> { "TINK" },
 								WheelType.Mono,
 								TypeOfBike.Allround,
+								AaRideType.NoAaRide,
 								"Test description",
 								"1");
 
@@ -86,7 +88,7 @@ namespace TestTINKLib
 				"Id=3, wheel(s)=Two, type=Cargo, demo=False, state=Disposable, location=On the road.",
 				l_oBike.ToString());
 
-			l_oBike = new BikeInfoMutable("3", LockModel.ILockIt, true, new List<string> { "TINK" }, WheelType.Trike, TypeOfBike.Allround, "Test description", "5", dateTimeProvider: () => new DateTime(1970, 1, 1));
+			l_oBike = new BikeInfoMutable("3", LockModel.ILockIt, true, new List<string> { "TINK" }, WheelType.Trike, TypeOfBike.Allround, AaRideType.NoAaRide, "Test description", "5", dateTimeProvider: () => new DateTime(1970, 1, 1));
 			Assert.AreEqual(
 				"Id=3, wheel(s)=Trike, type=Allround, demo=True, state=Disposable, location=Station 5.",
 				l_oBike.ToString());
diff --git a/TestShareeLib/Model/Bikes/BikeInfoNS/BC/TestBikeViewModel.cs b/TestShareeLib/Model/Bikes/BikeInfoNS/BC/TestBikeViewModel.cs
index dd4621b..cd4179f 100644
--- a/TestShareeLib/Model/Bikes/BikeInfoNS/BC/TestBikeViewModel.cs
+++ b/TestShareeLib/Model/Bikes/BikeInfoNS/BC/TestBikeViewModel.cs
@@ -23,13 +23,14 @@ namespace UITest.Fixtures.ViewModel
 				IEnumerable<string> group = null,
 				WheelType? wheelType = null,
 				TypeOfBike? typeOfBike = null,
+				AaRideType? aaRideType = null,
 				string description = null,
 				string stationId = null,
 				string stationName = null,
 				Uri operatorUri = null,
 				Func<DateTime> dateTimeProvider = null,
 				IStateInfo stateInfo = null) : base(
-					new Bike(id, lockModel, wheelType, typeOfBike, description),
+					new Bike(id, lockModel, wheelType, typeOfBike, aaRideType, description),
 					new TINK.Model.Bikes.BikeInfoNS.DriveNS.Drive(),
 					TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri,
 					pisDemo,
@@ -55,6 +56,7 @@ namespace UITest.Fixtures.ViewModel
 				new List<string> { "TINK" },
 				WheelType.Trike,
 				TypeOfBike.Cargo,
+				AaRideType.NoAaRide,
 				"Test description",
 				"3",
 				"Radstation",
@@ -96,6 +98,7 @@ namespace UITest.Fixtures.ViewModel
 				new List<string> { "TINK" },
 				WheelType.Trike,
 				TypeOfBike.Cargo,
+				AaRideType.NoAaRide,
 				"Test description",
 				"3",
 				"Radstation",
@@ -130,7 +133,7 @@ namespace UITest.Fixtures.ViewModel
 		/// </summary>
 		public static BikeViewModelBase TestStateText_LoggedIn_Booked(Func<TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable, User, BikeViewModelBase> p_oFactory)
 		{
-			var l_oBike = new BikeInfoMutable("2", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Two, TypeOfBike.Cargo, "Test description", "3");
+			var l_oBike = new BikeInfoMutable("2", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Two, TypeOfBike.Cargo, AaRideType.NoAaRide, "Test description", "3");
 
 			// Update from Copri.
 			l_oBike.State.Load(
diff --git a/TestShareeLib/Model/Bikes/BikeInfoNS/BluetoothLock/TestBikeInfo.cs b/TestShareeLib/Model/Bikes/BikeInfoNS/BluetoothLock/TestBikeInfo.cs
index 50004dc..dd5919d 100644
--- a/TestShareeLib/Model/Bikes/BikeInfoNS/BluetoothLock/TestBikeInfo.cs
+++ b/TestShareeLib/Model/Bikes/BikeInfoNS/BluetoothLock/TestBikeInfo.cs
@@ -1,5 +1,4 @@
 using System;
-using NSubstitute.ExceptionExtensions;
 using NUnit.Framework;
 using TINK.Model.Bikes.BikeInfoNS.BikeNS;
 using TINK.Model.Bikes.BikeInfoNS.BluetoothLock;
@@ -12,17 +11,11 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike.BluetoothLock
 	public class TestBikeInfo
 	{
 		[Test]
-		public void TestCtorCopyNull()
-		{
+		public void TestCtorCopyNull() =>
 			Assert.Throws<ArgumentException>(
 				() => new BikeInfo(null, null),
 				"Verify that no unspecific reference not set to... exception is thrown");
 
-			Assert.Throws<ArgumentException>(
-				() => new BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("12", LockModel.ILockIt), new Drive(), TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri, "1"), null),
-				"Verify that no unspecific reference not set to... exception is thrown");
-		}
-
 		[Test]
 		public void TestCtorAvailable()
 		{
diff --git a/TestShareeLib/Model/Bikes/BikeInfoNS/CopriLock/TestBikeInfoMutable.cs b/TestShareeLib/Model/Bikes/BikeInfoNS/CopriLock/TestBikeInfoMutable.cs
index 10ca43c..af67078 100644
--- a/TestShareeLib/Model/Bikes/BikeInfoNS/CopriLock/TestBikeInfoMutable.cs
+++ b/TestShareeLib/Model/Bikes/BikeInfoNS/CopriLock/TestBikeInfoMutable.cs
@@ -7,31 +7,6 @@ namespace TestShareeLib.Model.Bike.CopriLock
 	[TestFixture]
 	public class TestBikeInfoMutable
 	{
-		[Test]
-		public void TestCtorBikeInfoNull()
-		{
-			Assert.That(
-				() => new BikeInfoMutable(null, "Station 32"),
-				Throws.ArgumentNullException);
-		}
 
-		[Test]
-		public void TestCtorBikeInfo()
-		{
-			var bike = new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike(
-					"MyId",
-					TINK.Model.Bikes.BikeInfoNS.BikeNS.LockModel.Sigo);
-
-			var bikeInfo = new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(
-				bike,
-				new Drive(new TINK.Model.Bikes.BikeInfoNS.DriveNS.EngineNS.Engine("BackendLock")),
-				DataSource.Copri,
-				"StationId",
-				new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo());
-
-			Assert.That(
-				new BikeInfoMutable(bikeInfo, "Station 32").Drive.Type,
-				Is.EqualTo(DriveType.Pedelec));
-		}
 	}
 }
diff --git a/TestShareeLib/Model/Bikes/BikeInfoNS/TestBikeCollectionMutable.cs b/TestShareeLib/Model/Bikes/BikeInfoNS/TestBikeCollectionMutable.cs
index c0cb4b8..1f21222 100644
--- a/TestShareeLib/Model/Bikes/BikeInfoNS/TestBikeCollectionMutable.cs
+++ b/TestShareeLib/Model/Bikes/BikeInfoNS/TestBikeCollectionMutable.cs
@@ -8,7 +8,8 @@ using TINK.Model.Bikes.BikeInfoNS.BikeNS;
 using TINK.Model.Bikes.BikeInfoNS.DriveNS;
 using TINK.Model.Connector.Updater;
 using TINK.Model.State;
-using TINK.Model.Station;
+using TINK.Model.Stations;
+using TINK.Model.Stations.StationNS;
 using BikeInfo = TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo;
 
 namespace TestTINKLib
@@ -26,6 +27,7 @@ namespace TestTINKLib
 				IEnumerable<string> group = null,
 				WheelType? wheelType = null,
 				TypeOfBike? typeOfBike = null,
+				AaRideType? aaRideType = null,
 				string description = null,
 				string stationId = null,
 				string stationName = null,
@@ -33,7 +35,7 @@ namespace TestTINKLib
 				RentalDescription tariffDescription = null,
 				Func<DateTime> dateTimeProvider = null,
 				IStateInfo stateInfo = null) : base(
-					new Bike(id, lockType, wheelType, typeOfBike, description),
+					new Bike(id, lockType, wheelType, typeOfBike, aaRideType, description),
 					new Drive(),
 					TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri,
 					isDemo,
@@ -167,14 +169,14 @@ namespace TestTINKLib
 
 			var stations = new List<IStation>
 			{
-				new Station("7", new List<string>(), null, "My facy station")
+				new Station("7", new List<string>(), null, "My fancy station")
 			};
 
 			bikeColl.Update(l_oBikeResponse, stations);
 
 			// Verify modified state
 			Assert.That(bikeColl.GetById("57").StationId, Is.EqualTo("7"));
-			Assert.That(bikeColl.GetById("57").StationName, Is.EqualTo("My facy station"));
+			Assert.That(bikeColl.GetById("57").StationName, Is.EqualTo("My fancy station"));
 		}
 
 
@@ -192,12 +194,28 @@ namespace TestTINKLib
 
 			var bikeResponse = new List<BikeInfo>
 			{
-				new BikeInfo(new Bike("57" /* bike id*/, LockModel.ILockIt, WheelType.Trike, TypeOfBike.Allround, "Test description"), new Drive(), TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri, false, new List<string> {"TINK" }, "7" /*station id*/, null /*operator uri*/, null, DateTime.Now, "john@long,", "1234"),
+				new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(
+					new Bike("57" /* bike id*/, LockModel.ILockIt, WheelType.Trike, TypeOfBike.Allround, AaRideType.NoAaRide, "Test description"),
+					new Drive(),
+					TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri,
+					17, /* Lock id */
+					new Guid(),
+					new byte[0],
+					new byte[0],
+					new byte[0],
+					DateTime.Now,
+					"john@long,",
+					"7", /*station id*/
+					null, /*operator uri*/
+					null, /* tariff description */
+					false, /* is demo */
+					new List<string> {"TINK" } /* group id */
+					),
 			};
 
 			var stations = new List<IStation>
 			{
-				new Station("7", new List<string>(), null, "My facy station")
+				new Station("7", new List<string>(), null, "My fancy station")
 			};
 
 			bikeColl.Update(bikeResponse, stations);
diff --git a/TestShareeLib/Model/Connector/TestCachedQuery.cs b/TestShareeLib/Model/Connector/TestCachedQuery.cs
index be9aa5c..165a9c9 100644
--- a/TestShareeLib/Model/Connector/TestCachedQuery.cs
+++ b/TestShareeLib/Model/Connector/TestCachedQuery.cs
@@ -6,6 +6,7 @@ using TINK.Model.Connector;
 using TINK.Model.Services.CopriApi;
 using TINK.Repository;
 using TINK.Repository.Response;
+using TINK.Repository.Response.Stations;
 using TINK.Services.CopriApi;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Connector.Query
diff --git a/TestShareeLib/Model/Connector/TestCachedQueryLoggedIn.cs b/TestShareeLib/Model/Connector/TestCachedQueryLoggedIn.cs
index 29f4ea4..02a3656 100644
--- a/TestShareeLib/Model/Connector/TestCachedQueryLoggedIn.cs
+++ b/TestShareeLib/Model/Connector/TestCachedQueryLoggedIn.cs
@@ -7,6 +7,7 @@ using TINK.Model.Connector;
 using TINK.Model.Services.CopriApi;
 using TINK.Repository;
 using TINK.Repository.Response;
+using TINK.Repository.Response.Stations;
 using TINK.Services.CopriApi;
 
 namespace TestShareeLib.Model.Connector
diff --git a/TestShareeLib/Model/Connector/TestCopriCallsStatic.cs b/TestShareeLib/Model/Connector/TestCopriCallsStatic.cs
index 084c305..5116cd3 100644
--- a/TestShareeLib/Model/Connector/TestCopriCallsStatic.cs
+++ b/TestShareeLib/Model/Connector/TestCopriCallsStatic.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using NUnit.Framework;
 using TINK.Repository;
 using TINK.Repository.Response;
@@ -37,7 +37,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Request
 			// Ensure that answer holds a valid bike.
 			var l_oBike = CopriCallsStatic.DeserializeResponse<BikesAvailableResponse>(VALID_RESPONSE).bikes.FirstOrDefault().Value;
 			Assert.NotNull(l_oBike, "Response must contain at leas one bike.");
-			Assert.Greater(l_oBike.description.Length, 0, "Bike despcription must never be empty.");
+			Assert.Greater(l_oBike.description.Length, 0, "Bike description must never be empty.");
 			Assert.AreEqual(l_oBike.bike, "26");
 			Assert.That(
 				l_oBike.station,
@@ -108,7 +108,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Request
 			// Ensure that answer holds a valid bike.
 			var l_oBike = CopriCallsStatic.DeserializeResponse<BikesAvailableResponse>(VALID_RESPONSE).bikes.FirstOrDefault().Value;
 			Assert.NotNull(l_oBike, "Response must contain at leas one bike.");
-			Assert.Greater(l_oBike.description.Length, 0, "Bike despcription must never be empty.");
+			Assert.Greater(l_oBike.description.Length, 0, "Bike description must never be empty.");
 			Assert.That(l_oBike.bike, Is.Null);
 			Assert.That(l_oBike.station, Is.Not.Null);
 			Assert.AreEqual("available", l_oBike.state);
@@ -150,7 +150,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector.Request
 			// Ensure that answer holds a valid bike.
 			var l_oBike = CopriCallsStatic.DeserializeResponse<BikesReservedOccupiedResponse>(VALID_RESPONSE).bikes_occupied.FirstOrDefault().Value;
 			Assert.NotNull(l_oBike, "Response must contain at leas one bike.");
-			Assert.Greater(l_oBike.description.Length, 0, "Bike despcription must never be empty.");
+			Assert.Greater(l_oBike.description.Length, 0, "Bike description must never be empty.");
 			Assert.That(l_oBike.bike, Is.Not.Null);
 			Assert.That(l_oBike.station, Is.Not.Null);
 			Assert.Greater(l_oBike.state.Length, 0, "State info must never be null or empty.");
diff --git a/TestShareeLib/Model/Connector/TestCopriProviderHttps.cs b/TestShareeLib/Model/Connector/TestCopriProviderHttps.cs
index b5f926b..23c90bf 100644
--- a/TestShareeLib/Model/Connector/TestCopriProviderHttps.cs
+++ b/TestShareeLib/Model/Connector/TestCopriProviderHttps.cs
@@ -8,6 +8,7 @@ using TINK.Model.Services.CopriApi;
 using TINK.Repository;
 using TINK.Repository.Exception;
 using TINK.Repository.Response;
+using TINK.Repository.Response.Stations;
 using TINK.Services.CopriApi;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Connector
diff --git a/TestShareeLib/Model/Connector/TestQuery.cs b/TestShareeLib/Model/Connector/TestQuery.cs
index 4c8ca7d..0f34a85 100644
--- a/TestShareeLib/Model/Connector/TestQuery.cs
+++ b/TestShareeLib/Model/Connector/TestQuery.cs
@@ -4,10 +4,11 @@ using NSubstitute;
 using NUnit.Framework;
 using TINK.Repository;
 using TINK.Repository.Response;
+using TINK.Repository.Response.Stations;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Query
 {
-    [TestFixture]
+	[TestFixture]
     public class TestQuery
     {
         private const string BIKESAVAILABLE = @"{
diff --git a/TestShareeLib/Model/Connector/TestQueryLoggedIn.cs b/TestShareeLib/Model/Connector/TestQueryLoggedIn.cs
index 2429242..4795894 100644
--- a/TestShareeLib/Model/Connector/TestQueryLoggedIn.cs
+++ b/TestShareeLib/Model/Connector/TestQueryLoggedIn.cs
@@ -6,10 +6,11 @@ using NUnit.Framework;
 using TINK.Model.Connector;
 using TINK.Repository;
 using TINK.Repository.Response;
+using TINK.Repository.Response.Stations;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Connector
 {
-    [TestFixture]
+	[TestFixture]
     public class TestQueryLoggedIn
     {
         private const string BIKESAVAILABLE = @"{
diff --git a/TestShareeLib/Model/Connector/TestTextToTypeHelper.cs b/TestShareeLib/Model/Connector/TestTextToTypeHelper.cs
index a09f0bc..45310c3 100644
--- a/TestShareeLib/Model/Connector/TestTextToTypeHelper.cs
+++ b/TestShareeLib/Model/Connector/TestTextToTypeHelper.cs
@@ -1,11 +1,14 @@
-using System;
+using System;
 using System.Linq;
 using Newtonsoft.Json;
 using NUnit.Framework;
+using NUnit.Framework.Internal;
 using TINK.Model.Bikes.BikeInfoNS.BikeNS;
 using TINK.Model.Connector;
 using TINK.Repository.Exception;
 using TINK.Repository.Response;
+using TINK.Repository.Response.Stations;
+using TINK.Repository.Response.Stations.Station;
 using JsonConvertRethrow = TINK.Repository.Response.JsonConvertRethrow;
 
 namespace TestTINKLib.Fixtures.Connector
@@ -22,7 +25,7 @@ namespace TestTINKLib.Fixtures.Connector
 			// Verify prerequisites
 			Assert.IsNull(l_oInfo.description);
 
-			// Verify behaviour of member.
+			// Verify behavior of member.
 			Assert.IsNull(TextToTypeHelper.GetWheelType(l_oInfo));
 		}
 
@@ -43,7 +46,7 @@ namespace TestTINKLib.Fixtures.Connector
                 ""state"" : ""available""
              }");
 
-			// Verify behaviour of member.
+			// Verify behavior of member.
 			Assert.AreEqual(WheelType.Two, TextToTypeHelper.GetWheelType(l_oInfo));
 
 			l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
@@ -60,7 +63,7 @@ namespace TestTINKLib.Fixtures.Connector
                 ""state"" : ""available""
             }");
 
-			// Verify behaviour of member.
+			// Verify behavior of member.
 			Assert.AreEqual(WheelType.Trike, TextToTypeHelper.GetWheelType(l_oInfo));
 
 			l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
@@ -73,7 +76,7 @@ namespace TestTINKLib.Fixtures.Connector
                 ""state"" : ""available""
             }");
 
-			// Verify behaviour of member.
+			// Verify behavior of member.
 			Assert.That(TextToTypeHelper.GetWheelType(l_oInfo), Is.Null); // Was WheelType.Two up to 3.0.322
 
 			l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
@@ -86,7 +89,7 @@ namespace TestTINKLib.Fixtures.Connector
                 ""state"" : ""available""
             }");
 
-			// Verify behaviour of member.
+			// Verify behavior of member.
 			Assert.That(TextToTypeHelper.GetWheelType(l_oInfo), Is.Null); // Was WheelType.Two up to 3.0.322
 		}
 
@@ -98,7 +101,7 @@ namespace TestTINKLib.Fixtures.Connector
 			// Verify prerequisites
 			Assert.IsNull(l_oInfo.description);
 
-			// Verify behaviour of member.
+			// Verify behavior of member.
 			Assert.IsNull(TextToTypeHelper.GetTypeOfBike(l_oInfo));
 		}
 
@@ -119,7 +122,7 @@ namespace TestTINKLib.Fixtures.Connector
                 ""state"" : ""available""
              }");
 
-			// Verify behaviour of member.
+			// Verify behavior of member.
 			Assert.AreEqual(TypeOfBike.Cargo, TextToTypeHelper.GetTypeOfBike(info));
 
 			info = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
@@ -136,7 +139,7 @@ namespace TestTINKLib.Fixtures.Connector
                 ""state"" : ""available""
             }");
 
-			// Verify behaviour of member.
+			// Verify behavior of member.
 			Assert.AreEqual(TypeOfBike.Cargo, TextToTypeHelper.GetTypeOfBike(info));
 
 			info = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
@@ -153,7 +156,7 @@ namespace TestTINKLib.Fixtures.Connector
                 ""state"" : ""available""
             }");
 
-			// Verify behaviour of member.
+			// Verify behavior of member.
 			Assert.AreEqual(TypeOfBike.City, TextToTypeHelper.GetTypeOfBike(info));
 
 			info = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
@@ -168,12 +171,38 @@ namespace TestTINKLib.Fixtures.Connector
                 ""state"" : ""available""
             }");
 
-			// Verify behaviour of member.
+			// Verify behavior of member.
 			Assert.That(
 				TextToTypeHelper.GetTypeOfBike(info),
 				Is.Null); // Version up to 3.0.322 considered this bike to be a city bike to to description "Stadtrad"
 		}
 
+		[Test]
+		public void TestGetAaRideTypeNoAa() =>
+			Assert.That(
+				JsonConvert.DeserializeObject<BikeInfoBase>(@"
+				{
+					""aa_ride"": ""0"",
+				}").GetAaRideType(),
+				Is.EqualTo(AaRideType.NoAaRide));
+
+		[Test]
+		public void TestGetAaRideTypeAa() =>
+			Assert.That(
+				JsonConvert.DeserializeObject<BikeInfoBase>(@"
+				{
+					""aa_ride"": ""1"",
+				}").GetAaRideType(),
+				Is.EqualTo(AaRideType.AaRide));
+
+		[Test]
+		public void TestGetAaRideTypeNull() =>
+			Assert.That(
+				JsonConvert.DeserializeObject<BikeInfoBase>(@"
+						{
+						}").GetAaRideType(),
+				Is.Null);
+
 		[Test]
 		public void TestGetStateAvailable()
 			=> Assert.That(
@@ -229,7 +258,7 @@ namespace TestTINKLib.Fixtures.Connector
 			// Verify prerequisites
 			Assert.IsNull(info.state);
 
-			// Verify behaviour of member.
+			// Verify behavior of member.
 			Assert.Throws<InvalidResponseException<BikeInfoBase>>(() => TextToTypeHelper.GetState(info));
 		}
 
@@ -246,7 +275,7 @@ namespace TestTINKLib.Fixtures.Connector
                 ""state"" : ""available""
              }");
 
-			// Verify behaviour of member.
+			// Verify behavior of member.
 			Assert.IsFalse(TextToTypeHelper.GetIsDemo(l_oInfo));
 
 			l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
@@ -259,7 +288,7 @@ namespace TestTINKLib.Fixtures.Connector
                 ""state"" : ""available""
             }");
 
-			// Verify behaviour of member.
+			// Verify behavior of member.
 			Assert.IsFalse(TextToTypeHelper.GetIsDemo(l_oInfo));
 
 			l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
@@ -272,7 +301,7 @@ namespace TestTINKLib.Fixtures.Connector
                 ""state"" : ""available""
             }");
 
-			// Verify behaviour of member.
+			// Verify behavior of member.
 			Assert.IsTrue(TextToTypeHelper.GetIsDemo(l_oInfo));
 
 			l_oInfo = JsonConvertRethrow.DeserializeObject<BikeInfoBase>(@"
@@ -285,7 +314,7 @@ namespace TestTINKLib.Fixtures.Connector
                 ""state"" : ""available""
             }");
 
-			// Verify behaviour of member.
+			// Verify behavior of member.
 			Assert.IsFalse(TextToTypeHelper.GetIsDemo(l_oInfo));
 		}
 
@@ -368,7 +397,7 @@ namespace TestTINKLib.Fixtures.Connector
 		[Test]
 		public void TestGetStationGroup_Invalid()
 		{
-			var l_oStation = JsonConvertRethrow.DeserializeObject<StationsAvailableResponse.StationInfo>(
+			var l_oStation = JsonConvertRethrow.DeserializeObject<StationInfo>(
 			@"{
                     ""station"" : ""4"",
                     ""gps"" : { ""latitude"": ""47.6586936667"", ""longitude"": ""9.16863116667"" }
@@ -381,7 +410,7 @@ namespace TestTINKLib.Fixtures.Connector
 		[Test]
 		public void TestGetStationGroup_TINK()
 		{
-			var l_oStation = JsonConvertRethrow.DeserializeObject<StationsAvailableResponse.StationInfo>(
+			var l_oStation = JsonConvertRethrow.DeserializeObject<StationInfo>(
 			@"{
                     ""station"" : ""4"",
                     ""station_group"" : [ ""TINK"" ],
@@ -394,7 +423,7 @@ namespace TestTINKLib.Fixtures.Connector
 		[Test]
 		public void TestGetStationGroup_TINKAndKonrad()
 		{
-			var l_oStation = JsonConvertRethrow.DeserializeObject<StationsAvailableResponse.StationInfo>(
+			var l_oStation = JsonConvertRethrow.DeserializeObject<StationInfo>(
 			@"{
                     ""station"" : ""4"",
                     ""station_group"": [ ""TINK"", ""Konrad"" ],
@@ -1027,4 +1056,4 @@ namespace TestTINKLib.Fixtures.Connector
                          }").GetFrom(),
 				Is.EqualTo(DateTime.MinValue));
 	}
-}
\ No newline at end of file
+}
diff --git a/TestShareeLib/Model/Connector/Updater/TestUpdaterJSON.cs b/TestShareeLib/Model/Connector/Updater/TestUpdaterJSON.cs
index 01ce21c..4600ad8 100644
--- a/TestShareeLib/Model/Connector/Updater/TestUpdaterJSON.cs
+++ b/TestShareeLib/Model/Connector/Updater/TestUpdaterJSON.cs
@@ -12,6 +12,7 @@ using TINK.Model.State;
 using TINK.Model.User.Account;
 using TINK.Repository;
 using TINK.Repository.Response;
+using TINK.Repository.Response.Stations;
 using Xamarin.Forms;
 using static TINK.Repository.CopriCallsMemory;
 
@@ -165,7 +166,7 @@ namespace TestShareeLib.Model.Connector.Updater
 		[Test]
 		public void TestUpdateBikesAvailable_BikeNr5GetBooked()
 		{
-			// Bike 5 is availalbe.
+			// Bike 5 is centered.
 			var l_oBikesTarget = GetBikesAvailable(TinkApp.MerchantId, sampleSet: SampleSets.Set2, stageIndex: 1).GetBikesAvailable(DataSource.Copri);
 
 			Assert.AreEqual(12, l_oBikesTarget.Count, "Bike 5 is available an must be part of available bikes collection");
@@ -241,7 +242,7 @@ namespace TestShareeLib.Model.Connector.Updater
 
 		public void TestGetBikesAvailable_BikeNr5GetBooked()
 		{
-			// Bike 5 is availalbe.
+			// Bike 5 is centered.
 			var l_oBikesTarget = GetBikesAvailable(TinkApp.MerchantId, sampleSet: SampleSets.Set2, stageIndex: 1).GetBikesAvailable(DataSource.Copri);
 
 			Assert.AreEqual(11, l_oBikesTarget.Count, "Bike 5 is available an must be part of available bikes collection");
@@ -420,7 +421,7 @@ namespace TestShareeLib.Model.Connector.Updater
 		}
 
 		[Test]
-		public void TestGetBikesAll_BikesAvaialbleResponse()
+		public void TestGetBikesAll_BikesAvailbleResponse()
 		{
 			var availableResponse = JsonConvert.DeserializeObject<BikesAvailableResponse>(
 				@"{
@@ -460,7 +461,7 @@ namespace TestShareeLib.Model.Connector.Updater
 				"There must be one ILockitBike and one BC bike (BikeInfo class).");
 		}
 		[Test]
-		public void TestGetBikesAll_BikesAvaialbleResponse_InvalidState()
+		public void TestGetBikesAll_BikesAvailbleResponse_InvalidState()
 		{
 			var availableResponse = JsonConvert.DeserializeObject<BikesAvailableResponse>(
 				@"{
@@ -489,7 +490,7 @@ namespace TestShareeLib.Model.Connector.Updater
 		}
 
 		[Test]
-		public void TestGetBikesAll_BikesAvaialbleResponse_InvalidStation()
+		public void TestGetBikesAll_BikesAvailableResponse_InvalidStation()
 		{
 			var availableResponse = JsonConvert.DeserializeObject<BikesAvailableResponse>(
 				@"{
@@ -518,7 +519,7 @@ namespace TestShareeLib.Model.Connector.Updater
 		}
 
 		[Test]
-		public void TestGetBikesAll_BikesAvaialbleResponse_DuplicateId()
+		public void TestGetBikesAll_BikesAvailableResponse_DuplicateId()
 		{
 			var availableResponse = JsonConvert.DeserializeObject<BikesAvailableResponse>(
 				@"{
diff --git a/TestShareeLib/Model/Map/TestMapSpanFactory.cs b/TestShareeLib/Model/Map/TestMapSpanFactory.cs
index 5ed166c..a5d8567 100644
--- a/TestShareeLib/Model/Map/TestMapSpanFactory.cs
+++ b/TestShareeLib/Model/Map/TestMapSpanFactory.cs
@@ -1,4 +1,4 @@
-using NUnit.Framework;
+using NUnit.Framework;
 using TINK.Model;
 using TINK.Model.Map;
 
@@ -8,7 +8,7 @@ namespace TestShareeLib.Model.Map
 	public class TestMapSpanFactory
 	{
 		[Test]
-		public void TestCreatePositon()
+		public void TestCreatePosition()
 		{
 			Assert.That(
 				MapSpanFactory.Create(PositionFactory.Create(12, 13), 11).GetType(),
@@ -16,7 +16,7 @@ namespace TestShareeLib.Model.Map
 		}
 
 		[Test]
-		public void TestCreateNullPositon()
+		public void TestCreateNullPosition()
 		{
 			Assert.That(
 				MapSpanFactory.Create().GetType(),
diff --git a/TestShareeLib/Model/Station/TestData.cs b/TestShareeLib/Model/Station/TestData.cs
index c35afb1..1c62c63 100644
--- a/TestShareeLib/Model/Station/TestData.cs
+++ b/TestShareeLib/Model/Station/TestData.cs
@@ -1,4 +1,4 @@
-using NUnit.Framework;
+using NUnit.Framework;
 
 namespace TestShareeLib.Model.Station
 {
@@ -8,7 +8,7 @@ namespace TestShareeLib.Model.Station
 		[Test]
 		public void TestCtor()
 		{
-			var data = new TINK.Model.Station.Operator.Data();
+			var data = new TINK.Model.Stations.StationNS.Operator.Data();
 			Assert.That(
 				data.Color,
 				Is.Null);
@@ -33,7 +33,7 @@ namespace TestShareeLib.Model.Station
 		[Test]
 		public void TestCtor_Null()
 		{
-			var data = new TINK.Model.Station.Operator.Data(null, null, null, null, null);
+			var data = new TINK.Model.Stations.StationNS.Operator.Data(null, null, null, null, null);
 			Assert.That(
 				data.Color,
 				Is.Null);
diff --git a/TestShareeLib/Model/Station/TestNullStation.cs b/TestShareeLib/Model/Station/TestNullStation.cs
index da8f7f8..3163dad 100644
--- a/TestShareeLib/Model/Station/TestNullStation.cs
+++ b/TestShareeLib/Model/Station/TestNullStation.cs
@@ -1,6 +1,6 @@
-using System.Linq;
+using System.Linq;
 using NUnit.Framework;
-using TINK.Model.Station;
+using TINK.Model.Stations;
 
 namespace TestTINKLib.Fixtures.ObjectTests.Station
 {
@@ -10,9 +10,9 @@ namespace TestTINKLib.Fixtures.ObjectTests.Station
 		[Test]
 		public void TestConstruct()
 		{
-			var nullStation = new NullStation();
+			var nullStation = new TINK.Model.Stations.StationNS.NullStation();
 
-			// Was -1 before swiching type of id from int to string when switching from COPRI version v4.0 to v4.1
+			// Was -1 before switching type of id from int to string when switching from COPRI version v4.0 to v4.1
 			Assert.That(
 				nullStation.Id,
 				Is.Null);
diff --git a/TestShareeLib/Model/Station/TestStation.cs b/TestShareeLib/Model/Station/TestStation.cs
index cae4beb..7a0da1d 100644
--- a/TestShareeLib/Model/Station/TestStation.cs
+++ b/TestShareeLib/Model/Station/TestStation.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
@@ -13,7 +13,7 @@ namespace TestTINKLib.Fixtures.Station
 		[Test]
 		public void TestConstruct()
 		{
-			var l_oStation = new TINK.Model.Station.Station("7", new HashSet<string>(new List<string> { "TINK" }).ToList(), PositionFactory.Create(1, 2), "Hallo");
+			var l_oStation = new TINK.Model.Stations.StationNS.Station("7", new HashSet<string>(new List<string> { "TINK" }).ToList(), PositionFactory.Create(1, 2), "Hallo");
 			Assert.AreEqual("7", l_oStation.Id);
 			Assert.AreEqual("TINK", string.Join(",", l_oStation.Group));
 			Assert.AreEqual(1, l_oStation.Position.Latitude);
@@ -24,7 +24,7 @@ namespace TestTINKLib.Fixtures.Station
 		[Test]
 		public void TestConstruct_InvalidStationName()
 		{
-			var l_oStation = new TINK.Model.Station.Station("7", new HashSet<string>(new List<string> { "TINK" }).ToList(), PositionFactory.Create(1, 2), null);
+			var l_oStation = new TINK.Model.Stations.StationNS.Station("7", new HashSet<string>(new List<string> { "TINK" }).ToList(), PositionFactory.Create(1, 2), null);
 			Assert.AreEqual("7", l_oStation.Id);
 			Assert.AreEqual("TINK", string.Join(",", l_oStation.Group));
 			Assert.AreEqual(1, l_oStation.Position.Latitude);
@@ -35,14 +35,14 @@ namespace TestTINKLib.Fixtures.Station
 		[Test]
 		public void TestConstruct_InvalidStationGroup()
 		{
-			Assert.Throws<ArgumentException>(() => new TINK.Model.Station.Station("7", null, PositionFactory.Create(1, 2), "Hallo"));
+			Assert.Throws<ArgumentException>(() => new TINK.Model.Stations.StationNS.Station("7", null, PositionFactory.Create(1, 2), "Hallo"));
 		}
 
 		[Test]
 		public void TestConstruct_NoOperator()
 		{
 			Assert.That(
-				new TINK.Model.Station.Station("7", new List<string>(), PositionFactory.Create(1, 2), "Hallo").OperatorData,
+				new TINK.Model.Stations.StationNS.Station("7", new List<string>(), PositionFactory.Create(1, 2), "Hallo").OperatorData,
 				Is.Not.Null);
 		}
 	}
diff --git a/TestShareeLib/Model/TestBikeCollectionFilter.cs b/TestShareeLib/Model/TestBikeCollectionFilter.cs
index 6ec3384..e6d519c 100644
--- a/TestShareeLib/Model/TestBikeCollectionFilter.cs
+++ b/TestShareeLib/Model/TestBikeCollectionFilter.cs
@@ -16,11 +16,29 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike
 		public void TestGetAtStation()
 		{
 			var coll = new BikeCollection(
-				new Dictionary<string, TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo>
+				new Dictionary<string, BikeInfo>
 				{
-					{"3", new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("7", LockModel.ILockIt), new Drive(), TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri,"3" /* Stadion id */) },
-					{"7", new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("8", LockModel.ILockIt), new Drive(), TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri,"12" /* Stadion id */) },
-					{"12", new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("33", LockModel.ILockIt), new Drive(), TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri,"12" /* Stadion id */) }
+					{"3", new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(
+						new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("7", LockModel.ILockIt),
+						new Drive(),
+						DataSource.Copri,
+						17, /* Lock id */
+						new Guid(), 
+						"3" /* Station id */) },
+					{"7", new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(
+						new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("8", LockModel.ILockIt),
+						new Drive(),
+						DataSource.Copri,
+						17, /* Lock id */
+						new Guid(),
+						"12" /* Station id */) },
+					{"12",
+						new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("33", LockModel.ILockIt),
+						new Drive(),
+						DataSource.Copri,
+						17, /* Lock id */
+						new Guid(),
+						"12" /* Station id */) }
 				});
 
 			Assert.AreEqual(
@@ -57,10 +75,18 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike
 		{
 			// Holds no LockIt bikes
 			var coll = new BikeCollection(
-				new Dictionary<string, TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo>
+				new Dictionary<string, BikeInfo>
 				{
-					{"7", new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("8", LockModel.ILockIt), new Drive(), TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri,"12" /* Stadion id */) },
-					{"12", new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("33", LockModel.ILockIt), new Drive(), TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri,"12" /* Stadion id */) }
+					{"7", new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("8", LockModel.ILockIt),
+						new Drive(),
+						DataSource.Copri,
+						"12", /* Station id */
+						new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo()) },
+					{"12", new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("33", LockModel.ILockIt),
+						new Drive(),
+						DataSource.Copri,
+						"12", /* Station id */
+						new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo()) }
 				});
 
 			Assert.AreEqual(
@@ -74,11 +100,24 @@ namespace TestTINKLib.Fixtures.ObjectTests.Bike
 
 			// Holds no LockIt bike with matching station number.
 			var coll = new BikeCollection(
-				new Dictionary<string, TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo>
+				new Dictionary<string, BikeInfo>
 				{
-						{"7", new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("8", LockModel.ILockIt), new Drive(), TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri,"12" /* Stadion id */) },
-						{"11", new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("33", LockModel.ILockIt), new Drive(), DataSource.Copri, 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "12" /* Stadion id */) },
-						{"12", new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("33", LockModel.ILockIt), new Drive(), TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri,"12" /* Stadion id */) }
+						{"7", new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("8", LockModel.ILockIt),
+							new Drive(),
+							DataSource.Copri,
+							"12", /* Station id */
+							new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo()) },
+						{"11", new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("33", LockModel.ILockIt),
+							new Drive(),
+							DataSource.Copri,
+							5200544,
+							new Guid("00000000-0000-0000-0000-000000000001"),
+							"12" /* Station id */) },
+						{"12", new TINK.Model.Bikes.BikeInfoNS.CopriLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("33", LockModel.ILockIt),
+							new Drive(),
+							DataSource.Copri,
+							"12", /* Station id */
+							new TINK.Model.Bikes.BikeInfoNS.CopriLock.LockInfo()) }
 				});
 
 			Assert.AreEqual(
diff --git a/TestShareeLib/Model/TestNullPosition.cs b/TestShareeLib/Model/TestNullPosition.cs
index da721dc..8a5cc4b 100644
--- a/TestShareeLib/Model/TestNullPosition.cs
+++ b/TestShareeLib/Model/TestNullPosition.cs
@@ -1,4 +1,4 @@
-using NUnit.Framework;
+using NUnit.Framework;
 using TINK.Model;
 
 namespace TestShareeLib.Model
@@ -9,19 +9,19 @@ namespace TestShareeLib.Model
 		[Test]
 		public void TestCtor()
 		{
-			var positon = PositionFactory.Create();
-			Assert.That(positon.GetType(), Is.EqualTo(typeof(NullPostion)), "Object under test is not of expected type.");
+			var position = PositionFactory.Create();
+			Assert.That(position.GetType(), Is.EqualTo(typeof(NullPosition)), "Object under test is not of expected type.");
 
 			Assert.That(
-				positon.IsValid,
+				position.IsValid,
 				Is.False);
 
 			Assert.That(
-				positon.Longitude,
+				position.Longitude,
 				Is.EqualTo(double.NaN));
 
 			Assert.That(
-				positon.Latitude,
+				position.Latitude,
 				Is.EqualTo(double.NaN));
 		}
 	}
diff --git a/TestShareeLib/Model/TestPosition.cs b/TestShareeLib/Model/TestPosition.cs
index 754c126..7412bee 100644
--- a/TestShareeLib/Model/TestPosition.cs
+++ b/TestShareeLib/Model/TestPosition.cs
@@ -1,4 +1,4 @@
-using NUnit.Framework;
+using NUnit.Framework;
 using TINK.Model;
 
 namespace TestShareeLib.Model
@@ -9,42 +9,42 @@ namespace TestShareeLib.Model
 		[Test]
 		public void TestEquals()
 		{
-			var positonA = PositionFactory.Create(12, 13);
-			var positonB = PositionFactory.Create(12, 13);
+			var positionA = PositionFactory.Create(12, 13);
+			var positionB = PositionFactory.Create(12, 13);
 
-			Assert.That(positonA.GetType(), Is.EqualTo(typeof(Position)), "Object under test is not of expected type.");
-			Assert.That(positonB.GetType(), Is.EqualTo(typeof(Position)), "Object under test is not of expected type.");
+			Assert.That(positionA.GetType(), Is.EqualTo(typeof(Position)), "Object under test is not of expected type.");
+			Assert.That(positionB.GetType(), Is.EqualTo(typeof(Position)), "Object under test is not of expected type.");
 
 			Assert.That(
-				positonA.Equals(positonB),
+				positionA.Equals(positionB),
 				Is.True);
 		}
 
 		[Test]
 		public void TestEqualsNotEquaLong()
 		{
-			var positonA = PositionFactory.Create(12, 13);
-			var positonB = PositionFactory.Create(13, 13);
+			var positionA = PositionFactory.Create(12, 13);
+			var positionB = PositionFactory.Create(13, 13);
 
-			Assert.That(positonA.GetType(), Is.EqualTo(typeof(Position)), "Object under test is not of expected type.");
-			Assert.That(positonB.GetType(), Is.EqualTo(typeof(Position)), "Object under test is not of expected type.");
+			Assert.That(positionA.GetType(), Is.EqualTo(typeof(Position)), "Object under test is not of expected type.");
+			Assert.That(positionB.GetType(), Is.EqualTo(typeof(Position)), "Object under test is not of expected type.");
 
 			Assert.That(
-				positonA.Equals(positonB),
+				positionA.Equals(positionB),
 				Is.False);
 		}
 
 		[Test]
 		public void TestEqualsNotEquaLat()
 		{
-			var positonA = PositionFactory.Create(12, 13);
-			var positonB = PositionFactory.Create(12, 12);
+			var positionA = PositionFactory.Create(12, 13);
+			var positionB = PositionFactory.Create(12, 12);
 
-			Assert.That(positonA.GetType(), Is.EqualTo(typeof(Position)), "Object under test is not of expected type.");
-			Assert.That(positonB.GetType(), Is.EqualTo(typeof(Position)), "Object under test is not of expected type.");
+			Assert.That(positionA.GetType(), Is.EqualTo(typeof(Position)), "Object under test is not of expected type.");
+			Assert.That(positionB.GetType(), Is.EqualTo(typeof(Position)), "Object under test is not of expected type.");
 
 			Assert.That(
-				positonA.Equals(positonB),
+				positionA.Equals(positionB),
 				Is.False);
 		}
 
diff --git a/TestShareeLib/Model/TestPositionFactory.cs b/TestShareeLib/Model/TestPositionFactory.cs
index bc26c4b..1812dbc 100644
--- a/TestShareeLib/Model/TestPositionFactory.cs
+++ b/TestShareeLib/Model/TestPositionFactory.cs
@@ -19,7 +19,7 @@ namespace TestShareeLib.Model
 		{
 			Assert.That(
 				PositionFactory.Create().GetType(),
-				Is.EqualTo(typeof(NullPostion)));
+				Is.EqualTo(typeof(NullPosition)));
 		}
 	}
 }
diff --git a/TestShareeLib/Model/TestTinkAppSelectStation.cs b/TestShareeLib/Model/TestTinkAppSelectStation.cs
index 4fd3876..8a195ee 100644
--- a/TestShareeLib/Model/TestTinkAppSelectStation.cs
+++ b/TestShareeLib/Model/TestTinkAppSelectStation.cs
@@ -12,7 +12,7 @@ using TINK.Model;
 using TINK.Model.Bikes;
 using TINK.Model.Connector;
 using TINK.Model.Settings;
-using TINK.Model.Station;
+using TINK.Model.Stations.StationNS;
 using TINK.Model.User;
 using TINK.Repository;
 using TINK.Services;
@@ -84,13 +84,13 @@ namespace TestTINKLib.Fixtures.UseCases.SelectStation
 
 			Assert.AreEqual(0, GetBikesAtStation(l_oTinkApp.ActiveUser, l_oConnector, l_oTinkApp.Stations, l_oTinkApp.SelectedStation.Id).Result.Count);
 
-			l_oTinkApp.SelectedStation = new TINK.Model.Station.Station("5", new List<string>(), null);
+			l_oTinkApp.SelectedStation = new TINK.Model.Stations.StationNS.Station("5", new List<string>(), null);
 			Assert.AreEqual(3, GetBikesAtStation(l_oTinkApp.ActiveUser, l_oConnector, l_oTinkApp.Stations, l_oTinkApp.SelectedStation.Id).Result.Count);
 			Assert.AreEqual("25", GetBikesAtStation(l_oTinkApp.ActiveUser, l_oConnector, l_oTinkApp.Stations, l_oTinkApp.SelectedStation.Id).Result.GetById("25").Id);
 			Assert.AreEqual("11", GetBikesAtStation(l_oTinkApp.ActiveUser, l_oConnector, l_oTinkApp.Stations, l_oTinkApp.SelectedStation.Id).Result.GetById("11").Id);
 			Assert.AreEqual("2", GetBikesAtStation(l_oTinkApp.ActiveUser, l_oConnector, l_oTinkApp.Stations, l_oTinkApp.SelectedStation.Id).Result.GetById("2").Id);
 
-			l_oTinkApp.SelectedStation = new TINK.Model.Station.Station("10", new List<string>(), null);
+			l_oTinkApp.SelectedStation = new TINK.Model.Stations.StationNS.Station("10", new List<string>(), null);
 
 			Assert.AreEqual(
 				1,
@@ -98,7 +98,7 @@ namespace TestTINKLib.Fixtures.UseCases.SelectStation
 
 			Assert.AreEqual("18", GetBikesAtStation(l_oTinkApp.ActiveUser, l_oConnector, l_oTinkApp.Stations, l_oTinkApp.SelectedStation.Id).Result.GetById("18").Id);
 
-			l_oTinkApp.SelectedStation = new TINK.Model.Station.Station("91345", new List<string>(), null);
+			l_oTinkApp.SelectedStation = new TINK.Model.Stations.StationNS.Station("91345", new List<string>(), null);
 
 			Assert.AreEqual(0, GetBikesAtStation(l_oTinkApp.ActiveUser, l_oConnector, l_oTinkApp.Stations, l_oTinkApp.SelectedStation.Id).Result.Count);
 		}
diff --git a/TestShareeLib/Model/TestWhatsNew.cs b/TestShareeLib/Model/TestWhatsNew.cs
index 3570408..ebc3470 100644
--- a/TestShareeLib/Model/TestWhatsNew.cs
+++ b/TestShareeLib/Model/TestWhatsNew.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using NUnit.Framework;
@@ -41,8 +41,8 @@ namespace TestTINKLib.Fixtures.ObjectTests
 		}
 
 		/// <summary>
-		/// This test verified old implementedation which worked with the different versions to determine whenther whats new has to be shown or not.
-		/// Test updated to new implmentedation (based on filtering of AllFlavorsAndPlatformMessages)
+		/// This test verified old implementation which worked with the different versions to determine whenther whats new has to be shown or not.
+		/// Test updated to new implementation (based on filtering of AllFlavorsAndPlatformMessages)
 		/// </summary>
 		[Test]
 		public void TestIsShowRequired_Update_VersionWhichSupporsWhatsNew()
@@ -54,13 +54,13 @@ namespace TestTINKLib.Fixtures.ObjectTests
 					new Version(3, 0, 111),  /* Version when whats new was shown */
 					AppFlavor.ShareeBike,
 					DevicePlatform.Android).IsShowRequired,
-				"If whats new was last shonw for version 3.0.111 and current version is 2.0.335 info must be shown");
+				"If whats new was last shown for version 3.0.111 and current version is 2.0.335 info must be shown");
 		}
 
 
 		/// <summary>
-		/// This test verified old implementedation which worked with the different versions to determine whenther whats new has to be shown or not.
-		/// Test updated to new implmentedation (based on filtering of AllFlavorsAndPlatformMessages)
+		/// This test verified old implementation which worked with the different versions to determine whenther whats new has to be shown or not.
+		/// Test updated to new implementation (based on filtering of AllFlavorsAndPlatformMessages)
 		/// </summary>
 		[Test]
 		public void TestIsShowRequired_Update_VersionWithoutWhatsNew()
diff --git a/TestShareeLib/Repository/Response/TestBikeInfoBase.cs b/TestShareeLib/Repository/Response/TestBikeInfoBase.cs
new file mode 100644
index 0000000..e7dd7db
--- /dev/null
+++ b/TestShareeLib/Repository/Response/TestBikeInfoBase.cs
@@ -0,0 +1,89 @@
+using Newtonsoft.Json;
+using NUnit.Framework;
+using TINK.Repository.Response;
+
+namespace TestShareeLib.Repository.Response
+{
+	[TestFixture]
+	public class TestBikeInfoBase
+	{
+		[Test]
+		public void TestAaRide()
+		{
+			// Response for bike S3X1010 is a real world answer.
+			var bike = JsonConvert.DeserializeObject<BikeInfoBase>(@"
+{
+                ""gps"": {
+                    ""latitude"": ""49.802095"",
+                    ""longitude"": ""9.944987""
+                },
+                ""station"": ""SX9224997072021"",
+                ""bike"": ""S3X1010"",
+                ""state"": ""available"",
+                ""unlock_allowed"": ""1"",
+                ""authed"": ""0"",
+                ""bike_type"": {
+                    ""engine"": {
+                        ""manufacturer"": ""sigo""
+                    },
+                    ""battery"": {
+                        ""backend_accessible"": ""1"",
+                        ""hidden"": ""0"",
+                        ""charge_current_bars"": ""5"",
+                        ""charge_max_bars"": ""5"",
+                        ""charge_current_percent"": ""99""
+                    }
+                },
+                ""aa_ride"": ""1"",
+                ""uri_operator"": ""https://shareeapp-sx.copri.eu"",
+                ""system"": ""sigo"",
+                ""rental_description"": {
+                    ""tarif_elements"": {
+                        ""1"": [
+                            ""Mietgebühr"",
+                            ""1,50 € / 30 Min ""
+                        ],
+                        ""4"": [
+                            ""Max. Gebühr"",
+                            ""25,00 € / Tag""
+                        ],
+                        ""6"": [
+                            ""Gratis Mietzeit"",
+                            ""30 Min ""
+                        ]
+                    },
+                    ""id"": ""100"",
+                    ""reserve_timerange"": ""30"",
+                    ""rental_info"": {
+                        ""1"": [
+                            ""Tracking"",
+                            ""Ich stimme der Speicherung (Tracking) meiner Fahrstrecke zwecks wissenschaftlicher Auswertung und Berechnung der CO2-Einsparung zu!""
+                        ],
+                        ""2"": [
+                            ""AAFahrten"",
+                            ""Dieses E-Lastenrad darf nur an der Station zurück gegeben werden an der es ausgeliehen wurde!""
+                        ]
+                    },
+                    ""name"": ""Basis""
+                },
+                ""description"": ""E-Lastenrad"",
+                ""lock_state"": ""locked"",
+                ""bike_group"": [
+                    ""SX300101""
+                ]}");
+
+			Assert.That(
+				bike.aa_ride,
+				Is.EqualTo("1"));
+		}
+
+		[Test]
+		public void TestAaRideFalse() =>
+			Assert.That(
+				JsonConvert.DeserializeObject<BikeInfoBase>(@"
+				{
+					""aa_ride"": ""0"",
+				}").aa_ride,
+				Is.EqualTo("0"));
+	}
+}
diff --git a/TestShareeLib/Repository/TestCopriCallsMonkeyStore.cs b/TestShareeLib/Repository/TestCopriCallsMonkeyStore.cs
index ed3e0f3..0a0b774 100644
--- a/TestShareeLib/Repository/TestCopriCallsMonkeyStore.cs
+++ b/TestShareeLib/Repository/TestCopriCallsMonkeyStore.cs
@@ -4,6 +4,7 @@ using Newtonsoft.Json;
 using NUnit.Framework;
 using TINK.Repository;
 using TINK.Repository.Response;
+using TINK.Repository.Response.Stations;
 
 namespace UITest.Fixtures.ObjectTests.Connector
 {
diff --git a/TestShareeLib/Repository/TestCopriCallsStatic.cs b/TestShareeLib/Repository/TestCopriCallsStatic.cs
index fc7e6b1..174a8c3 100644
--- a/TestShareeLib/Repository/TestCopriCallsStatic.cs
+++ b/TestShareeLib/Repository/TestCopriCallsStatic.cs
@@ -113,7 +113,7 @@ namespace TestShareeLib.Repository
 			// Ensure that answer holds a valid bike.
 			var l_oBike = CopriCallsStatic.DeserializeResponse<BikesAvailableResponse>(VALID_RESPONSE).bikes.FirstOrDefault().Value;
 			Assert.NotNull(l_oBike, "Response must contain at leas one bike.");
-			Assert.Greater(l_oBike.description.Length, 0, "Bike despcription must never be empty.");
+			Assert.Greater(l_oBike.description.Length, 0, "Bike description must never be empty.");
 			Assert.AreEqual(l_oBike.bike, "26");
 			Assert.That(
 				l_oBike.station,
@@ -184,7 +184,7 @@ namespace TestShareeLib.Repository
 			// Ensure that answer holds a valid bike.
 			var l_oBike = CopriCallsStatic.DeserializeResponse<BikesAvailableResponse>(VALID_RESPONSE).bikes.FirstOrDefault().Value;
 			Assert.NotNull(l_oBike, "Response must contain at leas one bike.");
-			Assert.Greater(l_oBike.description.Length, 0, "Bike despcription must never be empty.");
+			Assert.Greater(l_oBike.description.Length, 0, "Bike description must never be empty.");
 			Assert.That(l_oBike.bike, Is.Null);
 			Assert.That(l_oBike.station, Is.Not.Null);
 			Assert.AreEqual("available", l_oBike.state);
@@ -226,7 +226,7 @@ namespace TestShareeLib.Repository
 			// Ensure that answer holds a valid bike.
 			var l_oBike = CopriCallsStatic.DeserializeResponse<BikesReservedOccupiedResponse>(VALID_RESPONSE).bikes_occupied.FirstOrDefault().Value;
 			Assert.NotNull(l_oBike, "Response must contain at leas one bike.");
-			Assert.Greater(l_oBike.description.Length, 0, "Bike despcription must never be empty.");
+			Assert.Greater(l_oBike.description.Length, 0, "Bike description must never be empty.");
 			Assert.That(l_oBike.bike, Is.Not.Null);
 			Assert.That(l_oBike.station, Is.Not.Null);
 			Assert.Greater(l_oBike.state.Length, 0, "State info must never be null or empty.");
diff --git a/TestShareeLib/Services/BluetoothLock/Crypto/TestCryptoHelper.cs b/TestShareeLib/Services/BluetoothLock/Crypto/TestCryptoHelper.cs
index be241a5..3c25b03 100644
--- a/TestShareeLib/Services/BluetoothLock/Crypto/TestCryptoHelper.cs
+++ b/TestShareeLib/Services/BluetoothLock/Crypto/TestCryptoHelper.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Text;
 using NUnit.Framework;
 using TINK.Services.BluetoothLock.Crypto;
@@ -9,7 +9,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Services.BluetoothLock.Crypto
 	public class TestCryptoHelper
 	{
 		/// <summary>
-		/// Ensures that decyption from haveltec- lib produces the same results than sharee lib.
+		/// Ensures that decryption from haveltec- lib produces the same results than sharee lib.
 		/// </summary>
 		[Test]
 		public void Test_DecryptStringFromBytes_Aes()
@@ -41,7 +41,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Services.BluetoothLock.Crypto
 			// Encrypted seed value from lock (value copied from debugging session of sharing_ble_lib/ haveltec code)
 			byte[] seedLockEnc = (new sbyte[] { 92, 80, -36, -2, 101, -31, -23, -43, 71, 62, 126, -70, 54, -53, -119, -56 }).Select(x => (byte)x).ToArray();
 
-			//// Decryped seed value? access values? from lock (value copied from debugging session of sharing_ble_lib/ haveltec code)
+			//// Decrypted seed value? access values? from lock (value copied from debugging session of sharing_ble_lib/ haveltec code)
 			byte[] seedLockDec = (new sbyte[] { 62, -51, 96, -80, 7, -84, 48, -104, 47, 51, -22, -23, 30, -10, -88, -97 }).Select(x => (byte)x).ToArray();
 
 			var crypto = new AuthCryptoHelper(
@@ -67,7 +67,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.Services.BluetoothLock.Crypto
 			// Encrypted seed value from lock (value copied from debugging session of sharing_ble_lib/ haveltec code)
 			byte[] seedLockEnc = (new sbyte[] { 92, 80, -36, -2, 101, -31, -23, -43, 71, 62, 126, -70, 54, -53, -119, -56 }).Select(x => (byte)x).ToArray();
 
-			// Decryped seed value? access values? from lock (value copied from debugging session of sharing_ble_lib/ haveltec code)
+			// Decrypted seed value? access values? from lock (value copied from debugging session of sharing_ble_lib/ haveltec code)
 			byte[] seedLockDec = (new sbyte[] { 62, -51, 96, -80, 7, -84, 48, -104, 47, 51, -22, -23, 30, -10, -88, -97 }).Select(x => (byte)x).ToArray();
 
 			var crypto = new AuthCryptoHelper(
diff --git a/TestShareeLib/TestShareeLib.csproj b/TestShareeLib/TestShareeLib.csproj
index 46c2136..1c86bb7 100644
--- a/TestShareeLib/TestShareeLib.csproj
+++ b/TestShareeLib/TestShareeLib.csproj
@@ -27,6 +27,10 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="NSubstitute" Version="5.0.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BC/TestBikeAtStationViewModel.cs b/TestShareeLib/ViewModel/Bikes/Bike/BC/TestBikeAtStationViewModel.cs
index 9efc88a..907d92e 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BC/TestBikeAtStationViewModel.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BC/TestBikeAtStationViewModel.cs
@@ -27,13 +27,14 @@ namespace UITest.Fixtures.ViewModel
 				IEnumerable<string> group = null,
 				WheelType? wheelType = null,
 				TypeOfBike? typeOfBike = null,
+				AaRideType? aaRideType = null,
 				string description = null,
 				string stationId = null,
 				string stationName = null,
 				Uri operatorUri = null,
 				Func<DateTime> dateTimeProvider = null,
 				IStateInfo stateInfo = null) : base(
-					new Bike(id, lockModel, wheelType, typeOfBike, description),
+					new Bike(id, lockModel, wheelType, typeOfBike, aaRideType, description),
 					new Drive(),
 					TINK.Model.Bikes.BikeInfoNS.BC.DataSource.Copri,
 					isDemo,
@@ -159,12 +160,12 @@ namespace UITest.Fixtures.ViewModel
 		}
 
 		/// <summary>
-		/// Tests base class functionaltiy by using child.
+		/// Tests base class functionality by using child.
 		/// </summary>
 		[Test]
 		public void TestStateText_LoggedIn_ReservedBySomeoneElse()
 		{
-			var l_oBike = new BikeInfoMutable("2", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Two, TypeOfBike.Cargo, "Test description", "3");
+			var l_oBike = new BikeInfoMutable("2", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Two, TypeOfBike.Cargo, AaRideType.NoAaRide, "Test description", "3");
 
 			l_oBike.State.Load(
 				InUseStateEnum.Reserved,
@@ -203,7 +204,7 @@ namespace UITest.Fixtures.ViewModel
 		[Test]
 		public void TestStateText_LoggedIn_BookedBySomeoneElse()
 		{
-			var l_oBike = new BikeInfoMutable("2", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Two, TypeOfBike.Cargo, "Test description", "3");
+			var l_oBike = new BikeInfoMutable("2", LockModel.ILockIt, false, new List<string> { "TINK" }, WheelType.Two, TypeOfBike.Cargo, AaRideType.NoAaRide, "Test description", "3");
 
 			l_oBike.State.Load(
 				InUseStateEnum.Booked,
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedClosed.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedClosed.cs
index 4daebd1..92dc15a 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedClosed.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedClosed.cs
@@ -96,7 +96,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -158,7 +158,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -218,7 +218,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -275,7 +275,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -348,7 +348,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -419,7 +419,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -493,7 +493,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -563,7 +563,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -631,7 +631,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -698,7 +698,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -757,7 +757,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -819,7 +819,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -879,7 +879,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -940,7 +940,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -1000,7 +1000,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -1060,7 +1060,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -1121,7 +1121,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -1185,7 +1185,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -1250,7 +1250,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -1315,7 +1315,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -1381,7 +1381,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedDisconnected.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedDisconnected.cs
index 68b55d0..5ce1fa8 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedDisconnected.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedDisconnected.cs
@@ -120,7 +120,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -179,7 +179,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -237,7 +237,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -297,7 +297,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -364,7 +364,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -433,7 +433,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedOpen.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedOpen.cs
index 9068eb2..0d16852 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedOpen.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedOpen.cs
@@ -88,7 +88,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -149,7 +149,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -220,7 +220,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -287,7 +287,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -354,7 +354,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -425,7 +425,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -497,7 +497,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -571,7 +571,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -644,7 +644,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			await locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -714,7 +714,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -791,7 +791,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -867,7 +867,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -943,7 +943,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -1017,7 +1017,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -1094,7 +1094,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 				bike.LockInfo.Location.Longitude,
 				Is.EqualTo(7.78).Within(0.001));
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -1154,7 +1154,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -1214,7 +1214,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -1275,7 +1275,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -1337,7 +1337,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -1400,7 +1400,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedUnknown.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedUnknown.cs
index a9cd63c..12a7d05 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedUnknown.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestBookedUnknown.cs
@@ -87,7 +87,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -149,7 +149,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -209,7 +209,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -269,7 +269,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -329,7 +329,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -389,7 +389,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -450,7 +450,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -515,7 +515,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -580,7 +580,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -645,7 +645,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -711,7 +711,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -773,7 +773,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -833,7 +833,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -893,7 +893,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -954,7 +954,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -1016,7 +1016,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -1079,7 +1079,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableDisconnected.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableDisconnected.cs
index 7bd22e7..49e17c1 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableDisconnected.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableDisconnected.cs
@@ -82,7 +82,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -145,7 +145,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -217,7 +217,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -280,7 +280,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -343,7 +343,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -408,7 +408,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -474,7 +474,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -539,7 +539,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableOpen.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableOpen.cs
index ab9b09c..8f23641 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableOpen.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestDisposableOpen.cs
@@ -85,7 +85,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -148,7 +148,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -211,7 +211,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -272,7 +272,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -336,7 +336,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -409,7 +409,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedClosed.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedClosed.cs
index f912c5f..4269dd7 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedClosed.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedClosed.cs
@@ -88,7 +88,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -140,7 +140,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -214,7 +214,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -282,7 +282,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -350,7 +350,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -410,7 +410,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -465,7 +465,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -534,7 +534,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -603,7 +603,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -672,7 +672,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -739,7 +739,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -805,7 +805,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -871,7 +871,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -942,7 +942,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -1013,7 +1013,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -1084,7 +1084,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -1156,7 +1156,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedDisconnected.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedDisconnected.cs
index bac2edf..d7533c8 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedDisconnected.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedDisconnected.cs
@@ -84,7 +84,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -136,7 +136,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -206,7 +206,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -272,7 +272,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -338,7 +338,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -410,7 +410,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -478,7 +478,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -536,7 +536,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -596,7 +596,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -664,7 +664,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -732,7 +732,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedOpen.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedOpen.cs
index 46f8fd4..9133fb4 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedOpen.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedOpen.cs
@@ -85,7 +85,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -147,7 +147,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -216,7 +216,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -282,7 +282,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -354,7 +354,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -428,7 +428,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -506,7 +506,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -577,7 +577,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -648,7 +648,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel.Bikes.Bike.BluetoothLock.Re
 
 			locks.DidNotReceive().DisconnectAsync(Arg.Any<int>(), Arg.Any<Guid>());
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedUnknown.cs b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedUnknown.cs
index 6b42d35..9783bbc 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedUnknown.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/BluetoothLock/RequestHandler/TestReservedUnknown.cs
@@ -89,7 +89,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 				var subsequent = handler.HandleRequestOption1().Result;
 
-				// Verify behaviour
+				// Verify behavior
 				Received.InOrder(() =>
 				{
 					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -151,7 +151,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 				var subsequent = handler.HandleRequestOption1().Result;
 
-				// Verify behaviour
+				// Verify behavior
 				Received.InOrder(() =>
 				{
 					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -211,7 +211,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 				var subsequent = handler.HandleRequestOption1().Result;
 
-				// Verify behaviour
+				// Verify behavior
 				Received.InOrder(() =>
 				{
 					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -271,7 +271,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 				var subsequent = handler.HandleRequestOption1().Result;
 
-				// Verify behaviour
+				// Verify behavior
 				Received.InOrder(() =>
 				{
 					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -331,7 +331,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 				var subsequent = handler.HandleRequestOption1().Result;
 
-				// Verify behaviour
+				// Verify behavior
 				Received.InOrder(() =>
 				{
 					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -391,7 +391,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 				var subsequent = handler.HandleRequestOption1().Result;
 
-				// Verify behaviour
+				// Verify behavior
 				Received.InOrder(() =>
 				{
 					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -453,7 +453,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 				var subsequent = handler.HandleRequestOption1().Result;
 
-				// Verify behaviour
+				// Verify behavior
 				Received.InOrder(() =>
 				{
 					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -518,7 +518,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 				var subsequent = handler.HandleRequestOption1().Result;
 
-				// Verify behaviour
+				// Verify behavior
 				Received.InOrder(() =>
 				{
 					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -584,7 +584,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 				var subsequent = handler.HandleRequestOption1().Result;
 
-				// Verify behaviour
+				// Verify behavior
 				Received.InOrder(() =>
 				{
 					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -646,7 +646,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 				var subsequent = handler.HandleRequestOption2().Result;
 
-				// Verify behaviour
+				// Verify behavior
 				Received.InOrder(() =>
 				{
 					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -702,7 +702,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 				var subsequent = handler.HandleRequestOption2().Result;
 
-				// Verify behaviour
+				// Verify behavior
 				Received.InOrder(() =>
 				{
 					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -762,7 +762,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 				var subsequent = handler.HandleRequestOption2().Result;
 
-				// Verify behaviour
+				// Verify behavior
 				Received.InOrder(() =>
 				{
 					bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -824,7 +824,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -886,7 +886,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -949,7 +949,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.BluetoothLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestBookedClosed.cs b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestBookedClosed.cs
index a5c9cb6..ebc4bb3 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestBookedClosed.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestBookedClosed.cs
@@ -51,7 +51,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -121,7 +121,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -188,7 +188,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestBookedOpen.cs b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestBookedOpen.cs
index c08d7f9..957137e 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestBookedOpen.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestBookedOpen.cs
@@ -51,7 +51,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -121,7 +121,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -188,7 +188,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestDisposableClosed.cs b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestDisposableClosed.cs
index 69b37d5..63dc79a 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestDisposableClosed.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestDisposableClosed.cs
@@ -51,7 +51,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -119,7 +119,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -195,7 +195,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -268,7 +268,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -332,7 +332,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -400,7 +400,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -475,7 +475,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -551,7 +551,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -624,7 +624,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestFeedbackPending.cs b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestFeedbackPending.cs
index 20a47f6..86c3812 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestFeedbackPending.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestFeedbackPending.cs
@@ -49,7 +49,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -111,7 +111,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -170,7 +170,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestReservedClosed.cs b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestReservedClosed.cs
index 5b917ff..71658b5 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestReservedClosed.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/CopriLock/RequestHandler/TestReservedClosed.cs
@@ -54,7 +54,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -117,7 +117,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -186,7 +186,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -260,7 +260,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -331,7 +331,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption1().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -395,7 +395,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -461,7 +461,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -535,7 +535,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
@@ -609,7 +609,7 @@ namespace TestShareeLib.ViewModel.Bikes.Bike.CopriLock.RequestHandler
 
 			var subsequent = handler.HandleRequestOption2().Result;
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				bikesViewModel.Received(1).IsIdle = false; // GUI must be locked
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/TestBikeViewModelFactory.cs b/TestShareeLib/ViewModel/Bikes/Bike/TestBikeViewModelFactory.cs
index 821ae54..97dca3d 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/TestBikeViewModelFactory.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/TestBikeViewModelFactory.cs
@@ -16,6 +16,27 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 	[TestFixture]
 	public class TestBikeViewModelFactory
 	{
+		private class BikeInfoMutableUnsupported : BikeInfoMutable
+		{
+			/// <summary> Constructs a bike object from source. </summary>
+			public BikeInfoMutableUnsupported(IBikeInfo bike, string stationName) : base(
+				bike != null
+					? bike.Bike
+					: throw new ArgumentNullException(nameof(bike)),
+				bike.Drive,
+				bike.DataSource,
+				bike.IsDemo,
+				bike.Group,
+				bike.StationId,
+				stationName,
+				bike.OperatorUri,
+				bike.TariffDescription,
+				null /* date time provider */,
+				bike.State)
+			{
+			}
+		}
+
 		[Test]
 		public void TestCreateBluetoothLock()
 		{
@@ -71,7 +92,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 					null, // viewUpdateManager
 					NSubstitute.Substitute.For<ISmartDevice>(),
 					null, // viewService
-					new TINK.Model.Bikes.BikeInfoNS.BC.BikeInfoMutable(new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("42", TINK.Model.Bikes.BikeInfoNS.BikeNS.LockModel.ILockIt), new Drive(), DataSource.Copri, 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "42"), "My Station Name"),
+					new BikeInfoMutableUnsupported(new TINK.Model.Bikes.BikeInfoNS.BluetoothLock.BikeInfo(new TINK.Model.Bikes.BikeInfoNS.BikeNS.Bike("42", TINK.Model.Bikes.BikeInfoNS.BikeNS.LockModel.ILockIt), new Drive(), DataSource.Copri, 5200544, new Guid("00000000-0000-0000-0000-000000000001"), "42"), "My Station Name"),
 					NSubstitute.Substitute.For<IUser>(), // user
 					NSubstitute.Substitute.For<IInUseStateInfoProvider>(),
 					NSubstitute.Substitute.For<IBikesViewModel>(),
diff --git a/TestShareeLib/ViewModel/Bikes/Bike/TestTariffDescriptionViewModel.cs b/TestShareeLib/ViewModel/Bikes/Bike/TestTariffDescriptionViewModel.cs
index a9ea8ef..2c56913 100644
--- a/TestShareeLib/ViewModel/Bikes/Bike/TestTariffDescriptionViewModel.cs
+++ b/TestShareeLib/ViewModel/Bikes/Bike/TestTariffDescriptionViewModel.cs
@@ -145,5 +145,79 @@ namespace TestShareeLib.ViewModel.Bikes.Bike
 				viewModel.InfoEntry2,
 				Is.Empty);
 		}
+
+		[Test]
+		public void TestCtorAaFahrten()
+		{
+			var model = new RentalDescription
+			{
+				Name = "Fancy Tarif",
+				Id = 47,
+				TariffEntries = new System.Collections.Generic.Dictionary<string, RentalDescription.TariffElement>
+				{
+					{ "23", new RentalDescription.TariffElement { Value = "Max Gebühr", Description = "9.00 € / Tag"} },
+					{ "24", new RentalDescription.TariffElement { Value = "Gratis Mietzeit", Description = "30 Min  / Tag"} },
+				},
+				InfoEntries = new System.Collections.Generic.Dictionary<string, RentalDescription.InfoElement>
+				{
+					{ "14", new RentalDescription.InfoElement { Key = "AGB" , Value = "Mit der Mietrad Anmietung wird folgender Betreiber <a href='$varenv->{wwwhost}/site/agb.html' target='_blank'>AGB</a> zugestimmt" } },
+					{ "15", new RentalDescription.InfoElement { Key = "AAFahrten", Value = "Testtext aa Fahrten." } },
+				}
+			};
+
+			var viewModel = new TariffDescriptionViewModel(model);
+
+			Assert.That(
+				viewModel.Name,
+				Is.EqualTo("Fancy Tarif"));
+
+			Assert.That(
+				viewModel.TariffEntries.Count,
+				Is.EqualTo(2));
+
+			Assert.That(
+				viewModel.InfoEntries.Count,
+				Is.EqualTo(1));
+
+			Assert.That(
+				viewModel.TarifEntry1.Value,
+				Is.EqualTo("Max Gebühr"));
+
+			Assert.That(
+				viewModel.TarifEntry1.Description,
+				Is.EqualTo("9.00 € / Tag"));
+
+			Assert.That(
+				viewModel.TarifEntry2.Value,
+				Is.EqualTo("Gratis Mietzeit"));
+
+			Assert.That(
+				viewModel.TarifEntry2.Description,
+				Is.EqualTo("30 Min  / Tag"));
+
+			Assert.That(
+				viewModel.TarifEntry3.Value,
+				Is.Empty);
+
+			Assert.That(
+				viewModel.TarifEntry3.Description,
+				Is.Empty);
+
+			Assert.That(
+				viewModel.TrackingInfoText,
+				Is.Empty);
+
+			Assert.That(
+				viewModel.RideTypeText,
+				Is.EqualTo("Testtext aa Fahrten."));
+
+			Assert.That(
+				viewModel.InfoEntry1,
+				Is.EqualTo("Mit der Mietrad Anmietung wird folgender Betreiber <a href='$varenv->{wwwhost}/site/agb.html' target='_blank'>AGB</a> zugestimmt"));
+
+			Assert.That(
+				viewModel.InfoEntry2,
+				Is.Empty);
+		}
 	}
 }
diff --git a/TestShareeLib/ViewModel/BikesAtStation/TestBikesAtStationPageViewModel.cs b/TestShareeLib/ViewModel/BikesAtStation/TestBikesAtStationPageViewModel.cs
index 8ce9056..4a46ecb 100644
--- a/TestShareeLib/ViewModel/BikesAtStation/TestBikesAtStationPageViewModel.cs
+++ b/TestShareeLib/ViewModel/BikesAtStation/TestBikesAtStationPageViewModel.cs
@@ -77,7 +77,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 				permissions,
 				bluetooth,
 				Device.Android,
-				new TINK.Model.Station.Station("FR103", new List<string>(), null), // Was station id 103 before switching from data provider CopriCallsMemory(SampleSets.ShareeFr01_Set1, 1, ...) 
+				new TINK.Model.Stations.StationNS.Station("FR103", new List<string>(), null), // Was station id 103 before switching from data provider CopriCallsMemory(SampleSets.ShareeFr01_Set1, 1, ...) 
 				() => tinkApp.GetIsConnected(),
 				(isConnected) => tinkApp.GetConnector(isConnected),
 				geolocation.Active, // geolocation
@@ -163,7 +163,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 				permissions,
 				bluetooth,
 				Device.Android,
-				new TINK.Model.Station.Station("102", new List<string>(), null), // Station 102
+				new TINK.Model.Stations.StationNS.Station("102", new List<string>(), null), // Station 102
 				() => tinkApp.GetIsConnected(),
 				(isConnected) => tinkApp.GetConnector(isConnected),
 				geolocation.Active, // geolocation
@@ -246,7 +246,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 				permissions,
 				bluetooth,
 				Device.Android,
-				new TINK.Model.Station.Station("103", new List<string>(), null), // Station 103
+				new TINK.Model.Stations.StationNS.Station("103", new List<string>(), null), // Station 103
 				() => tinkApp.GetIsConnected(),
 				(isConnected) => tinkApp.GetConnector(isConnected),
 				geolocation.Active, // geolocation
@@ -259,7 +259,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 
 			await bikesAtStation.OnAppearingOrRefresh();
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				permissions.CheckStatusAsync();
@@ -371,7 +371,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 				permissions,
 				bluetooth,
 				Device.Android,
-				new TINK.Model.Station.Station("103", new List<string>(), null), // Station 103
+				new TINK.Model.Stations.StationNS.Station("103", new List<string>(), null), // Station 103
 				() => tinkApp.GetIsConnected(),
 				(isConnected) => tinkApp.GetConnector(isConnected),
 				geolocation.Active, // geolocation
@@ -384,7 +384,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 
 			await bikesAtStation.OnAppearingOrRefresh();
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				permissions.CheckStatusAsync();
@@ -499,7 +499,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 				permissions,
 				bluetooth,
 				Device.Android,
-				new TINK.Model.Station.Station("103", new List<string>(), null), // Station 103
+				new TINK.Model.Stations.StationNS.Station("103", new List<string>(), null), // Station 103
 				() => tinkApp.GetIsConnected(),
 				(isConnected) => tinkApp.GetConnector(isConnected),
 				geolocation.Active, // geolocation
@@ -512,7 +512,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 
 			await bikesAtStation.OnAppearingOrRefresh();
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				permissions.CheckStatusAsync();
@@ -624,7 +624,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 				permissions,
 				bluetooth,
 				Device.Android,
-				new TINK.Model.Station.Station("103", new List<string>(), null), // Station 103
+				new TINK.Model.Stations.StationNS.Station("103", new List<string>(), null), // Station 103
 				() => tinkApp.GetIsConnected(),
 				(isConnected) => tinkApp.GetConnector(isConnected),
 				geolocation.Active, // geolocation
@@ -637,7 +637,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 
 			await bikesAtStation.OnAppearingOrRefresh();
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				permissions.CheckStatusAsync();
@@ -747,7 +747,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 				permissions,
 				bluetooth,
 				Device.Android,
-				new TINK.Model.Station.Station("103", new List<string>(), null), // Station 103
+				new TINK.Model.Stations.StationNS.Station("103", new List<string>(), null), // Station 103
 				() => tinkApp.GetIsConnected(),
 				(isConnected) => tinkApp.GetConnector(isConnected),
 				geolocation.Active, // geolocation
@@ -760,7 +760,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 
 			await bikesAtStation.OnAppearingOrRefresh();
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				permissions.CheckStatusAsync();
@@ -863,7 +863,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 				permissions,
 				bluetooth,
 				Device.iOS,
-				new TINK.Model.Station.Station("FR101", new List<string>(), null), // Was 31 before switching CopriCallsMemory(SampleSets.Set2, 1, ...)
+				new TINK.Model.Stations.StationNS.Station("FR101", new List<string>(), null), // Was 31 before switching CopriCallsMemory(SampleSets.Set2, 1, ...)
 				() => tinkApp.GetIsConnected(),
 				(isConnected) => tinkApp.GetConnector(isConnected),
 				new GeolocationMock(),
@@ -942,7 +942,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 				permissions,
 				bluetooth,
 				Device.iOS,
-				new TINK.Model.Station.Station("4", new List<string>(), null),
+				new TINK.Model.Stations.StationNS.Station("4", new List<string>(), null),
 				() => tinkApp.GetIsConnected(),
 				(isConnected) => tinkApp.GetConnector(isConnected),
 				new GeolocationMock(),
@@ -1019,7 +1019,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 				permissions,
 				bluetooth,
 				Device.iOS,
-				new TINK.Model.Station.Station("FR103", new List<string>(), null), // Was station id 4 before switching from data provider CopriCallsMemory(SampleSets.Set2, 1, ...) 
+				new TINK.Model.Stations.StationNS.Station("FR103", new List<string>(), null), // Was station id 4 before switching from data provider CopriCallsMemory(SampleSets.Set2, 1, ...) 
 				() => tinkApp.GetIsConnected(),
 				(isConnected) => tinkApp.GetConnector(isConnected),
 				new GeolocationMock(),
@@ -1096,7 +1096,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 				permissions,
 				bluetooth,
 				Device.iOS,
-				new TINK.Model.Station.Station("FR103", new List<string>(), null), // Was station id 4 before switching from data provider CopriCallsMemory(SampleSets.Set2, 1
+				new TINK.Model.Stations.StationNS.Station("FR103", new List<string>(), null), // Was station id 4 before switching from data provider CopriCallsMemory(SampleSets.Set2, 1
 				() => tinkApp.GetIsConnected(),
 				(isConnected) => tinkApp.GetConnector(isConnected),
 				new GeolocationMock(),
@@ -1184,7 +1184,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 				permissions,
 				bluetooth,
 				Device.iOS,
-				new TINK.Model.Station.Station("FR103", new List<string>(), null), // Was station id 4 before switching from data provider CopriCallsCacheMemory()
+				new TINK.Model.Stations.StationNS.Station("FR103", new List<string>(), null), // Was station id 4 before switching from data provider CopriCallsCacheMemory()
 				() => tinkApp.GetIsConnected(),
 				(isConnected) => tinkApp.GetConnector(isConnected),
 				new GeolocationMock(),
@@ -1276,7 +1276,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 				permissions,
 				bluetooth,
 				Device.iOS,
-				new TINK.Model.Station.Station("FR103", new List<string>(), null), // Was station id 4 before switching from data provider CopriCallsCacheMemory()
+				new TINK.Model.Stations.StationNS.Station("FR103", new List<string>(), null), // Was station id 4 before switching from data provider CopriCallsCacheMemory()
 				() => tinkApp.GetIsConnected(),
 				(isConnected) => tinkApp.GetConnector(isConnected),
 				new GeolocationMock(),
diff --git a/TestShareeLib/ViewModel/MyBikes/TestMyBikesPageViewModel.cs b/TestShareeLib/ViewModel/MyBikes/TestMyBikesPageViewModel.cs
index a5ab644..57ca7dd 100644
--- a/TestShareeLib/ViewModel/MyBikes/TestMyBikesPageViewModel.cs
+++ b/TestShareeLib/ViewModel/MyBikes/TestMyBikesPageViewModel.cs
@@ -106,7 +106,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 
 			await myBikes.OnAppearingOrRefresh();
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				permissions.CheckStatusAsync();
@@ -203,7 +203,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 
 			await myBikes.OnAppearingOrRefresh();
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				permissions.CheckStatusAsync();
@@ -308,7 +308,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 
 			await myBikes.OnAppearingOrRefresh();
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				permissions.CheckStatusAsync();
@@ -408,7 +408,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 
 			await myBikes.OnAppearingOrRefresh();
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				permissions.CheckStatusAsync();
@@ -506,7 +506,7 @@ namespace TestTINKLib.Fixtures.ObjectTests.ViewModel
 
 			await myBikes.OnAppearingOrRefresh();
 
-			// Verify behaviour
+			// Verify behavior
 			Received.InOrder(() =>
 			{
 				permissions.CheckStatusAsync();
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/CopriCallsHttpReference.cs b/TestTINKLib/Fixtures/ObjectTests/Connector/CopriCallsHttpReference.cs
index 03da827..d0ad70c 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Connector/CopriCallsHttpReference.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Connector/CopriCallsHttpReference.cs
@@ -7,6 +7,7 @@ using Newtonsoft.Json;
 using TINK.Repository;
 using TINK.Repository.Exception;
 using TINK.Repository.Response;
+using TINK.Repository.Response.Stations;
 
 namespace UITest.Fixtures.Connector
 {
@@ -18,7 +19,7 @@ namespace UITest.Fixtures.Connector
 		/// <summary> Logs user in. </summary>
 		/// <param name="copriHost">Host to connect to. </param>
 		/// <param name="merchantId">Id of the merchant.</param>
-		/// <param name="mailAddress">Mailaddress of user to log in.</param>
+		/// <param name="mailAddress">Mail address of user to log in.</param>
 		/// <param name="password">Password to log in.</param>
 		/// <param name="deviceId">Id specifying user and hardware.</param>
 		/// <remarks>Response which holds auth cookie <see cref="ResponseBase.authcookie"/></remarks>
@@ -134,7 +135,7 @@ namespace UITest.Fixtures.Connector
 		}
 
 		/// <summary>
-		/// Gets a list of bikes reserved/ booked by acctive user from Copri.
+		/// Gets a list of bikes reserved/ booked by active user from Copri.
 		/// </summary>
 		/// <param name="merchantId">Id of the merchant.</param>
 		/// <param name="p_strSessionCookie">Cookie to authenticate user.</param>
@@ -190,7 +191,7 @@ namespace UITest.Fixtures.Connector
 		}
 
 		/// <summary>
-		/// Gets canel booking request response.
+		/// Gets cancel booking request response.
 		/// </summary>
 		/// <param name="merchantId">Id of the merchant.</param>
 		/// <param name="p_iBikeId">Id of the bike to book.</param>
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriCallsHttps.cs b/TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriCallsHttps.cs
index 4ed8a72..cb2263c 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriCallsHttps.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Connector/TestCopriCallsHttps.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Reflection;
 using System.Threading;
@@ -330,7 +330,7 @@ namespace UITest.Fixtures.Connector
 			Assert.Greater(
 				bike.description.Length,
 				0,
-				"Bike despcription must never be empty.");
+				"Bike description must never be empty.");
 
 			Assert.That(
 				bike.bike,
@@ -391,7 +391,7 @@ namespace UITest.Fixtures.Connector
 			Assert.Greater(
 				bike.description.Length,
 				0,
-				"Bike despcription must never be empty.");
+				"Bike description must never be empty.");
 
 			Assert.That(
 				bike.bike,
@@ -405,7 +405,7 @@ namespace UITest.Fixtures.Connector
 		}
 
 		/// <summary>
-		/// Attention: Behaves different if called with a period smaller 15minutes because bike will alreay be reserved.
+		/// Attention: Behaves different if called with a period smaller 15minutes because bike will already be reserved.
 		/// </summary>
 		[Test, Explicit, Ignore("Avoid testrunner running explicit tests.")]
 		public void TestDoReserveCall(
@@ -437,7 +437,7 @@ namespace UITest.Fixtures.Connector
 			// State of bike for which to cancel booking must be available. 
 			Assert.NotNull(
 				CopriCallsHttpsReference.GetBikesAvailableCall(url, TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie)?.bikes?.FirstOrDefault(x => x.Value.bike == l_oBikeId).Value,
-				"Prerequities check failed: Bike with given id must be available;");
+				"Prerequisites check failed: Bike with given id must be available;");
 
 			var l_oBookingResponse = DoReserveAsync(
 				CopriServerUriList.DevelopUri.AbsoluteUri,
@@ -457,7 +457,7 @@ namespace UITest.Fixtures.Connector
 		}
 
 		/// <summary>
-		/// Attention: Behaves different if called with a period smaller 15minutes because bike will alreay be reserved.
+		/// Attention: Behaves different if called with a period smaller 15minutes because bike will already be reserved.
 		/// </summary>
 		[Test, Explicit, Ignore("Avoid testrunner running explicit tests.")]
 		public void TestDoCancelReservationCall(
@@ -490,7 +490,7 @@ namespace UITest.Fixtures.Connector
 			var l_oBikeToCancel = CopriCallsHttpsReference.GetBikesAvailableCall(url, TinkApp.MerchantId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie)?.bikes?.FirstOrDefault(x => x.Value.bike == l_oBikeId).Value;
 			if (l_oBikeToCancel != null)
 			{
-				// Bike is avilable. Do request before unning test.
+				// Bike is available. Do request before unning test.
 				CopriCallsHttpsReference.DoReserveCall(url, TinkApp.MerchantId, l_oBikeId, TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie);
 			}
 
@@ -579,7 +579,7 @@ namespace UITest.Fixtures.Connector
 				string.Format("{0}{1}", TestTINKLib.LoginSessionCopriInfo.JavaministerHardwareNr1.AuthCookie, TinkApp.MerchantId),
 				l_oBookingResponse.authcookie);
 
-			Assert.Greater(l_oBike.description.Length, 0, "Bike despcription must never be empty.");
+			Assert.Greater(l_oBike.description.Length, 0, "Bike description must never be empty.");
 			Assert.That(l_oBike.bike, Is.Not.Null, "Bike index must not be null.");
 			Assert.That(
 				l_oBike.station,
diff --git a/TestTINKLib/Fixtures/ObjectTests/Connector/TestFilter.cs b/TestTINKLib/Fixtures/ObjectTests/Connector/TestFilter.cs
index b54dc94..47f6fd6 100644
--- a/TestTINKLib/Fixtures/ObjectTests/Connector/TestFilter.cs
+++ b/TestTINKLib/Fixtures/ObjectTests/Connector/TestFilter.cs
@@ -17,12 +17,13 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
 		[Test]
 		public void TestGetStationsAll()
 		{
+			var appContextInfo = new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2));
 			var connector = new ConnectorCache(
-				new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)),
+						appContextInfo,
 						null /*UI language */,
 						string.Empty,
 						string.Empty,
-						server: new CopriCallsMemory001());
+						server: new CopriCallsMemory001(merchantId: appContextInfo.MerchantId));
 
 			var filter = new FilteredConnector(new List<string> { FilterHelper.CARGOBIKE, FilterHelper.CITYBIKE }, connector);
 			var stations = filter.Query.GetBikesAndStationsAsync().Result.Response;
@@ -53,12 +54,13 @@ namespace TestTINKLib.Fixtures.ObjectTests.Connector
 		[Test]
 		public void TestGetBikesAll()
 		{
+			var appContextInfo = new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2));
 			var l_oConnector = new ConnectorCache(
-				new AppContextInfo("MyMerchId", "MyApp", new Version(1, 2)),
+						appContextInfo,
 						null /*UI language */,
 						string.Empty,
 						string.Empty,
-						server: new CopriCallsMemory001());
+						server: new CopriCallsMemory001(merchantId: appContextInfo.MerchantId));
 
 			var l_oFilter = new FilteredConnector(new List<string> { FilterHelper.CARGOBIKE, FilterHelper.CITYBIKE }, l_oConnector);
 			var l_oBikes = l_oFilter.Query.GetBikesAsync().Result.Response;
diff --git a/en-US_User.dic b/en-US_User.dic
new file mode 100644
index 0000000..9450592
--- /dev/null
+++ b/en-US_User.dic
@@ -0,0 +1,21 @@
+app
+auth
+backend
+bluetooth
+bord
+copri
+deserialization
+deserialized
+flyout
+Geolocation
+gps
+Guid
+https
+Namespace
+offline
+ok
+popup
+pwd
+uri
+uris
+Url