diff --git a/app/build.gradle b/app/build.gradle
index 328357b..1a66562 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,14 +8,13 @@ android {
         applicationId "com.eleith.calchoochoo"
         minSdkVersion 22
         targetSdkVersion 25
-        versionCode 3
-        versionName "1.2"
-
+        versionCode 4
+        versionName "1.3"
         resValue "string", "GOOGLE_MAPS_API_KEY", GOOGLE_MAPS_API_KEY
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 7562555..63bc8cd 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -15,3 +15,30 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+-dontwarn org.joda.convert.**
+-dontwarn org.joda.time.**
+-keep class org.joda.time.** { *; }
+-keep interface org.joda.time.** { *; }
+
+-dontwarn sun.misc.**
+
+-keepclassmembers class rx.internal.util.unsafe.*ArrayQueue*Field* {
+   long producerIndex;
+   long consumerIndex;
+}
+
+-keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueProducerNodeRef {
+    rx.internal.util.atomic.LinkedQueueNode producerNode;
+}
+
+-keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueConsumerNodeRef {
+    rx.internal.util.atomic.LinkedQueueNode consumerNode;
+}
+
+-dontnote rx.internal.util.PlatformDependent
+
+# Parceler library
+-keep interface org.parceler.Parcel
+-keep @org.parceler.Parcel class * { *; }
+-keep class **$$Parcelable { *; }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c1d030b..2c9e135 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,9 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.eleith.calchoochoo">
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.eleith.calchoochoo">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission
+        android:name="android.permission.CHANGE_NETWORK_STATE"
+        tools:node="remove"/>
+    <uses-permission
+        android:name="android.permission.WAKE_LOCK"
+        tools:node="remove"/>
+    <uses-permission
+        android:name="android.permission.READ_PHONE_STATE"
+        tools:node="remove"/>
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
+        tools:node="remove"/>
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        tools:node="remove"/>
 
     <application
         android:name=".ChooChooApplication"
@@ -46,8 +63,8 @@
 
         <receiver android:name=".ChooChooAlarmReceiver">
             <intent-filter>
-                <action android:name="android.media.action.DISPLAY_NOTIFICATION" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="android.media.action.DISPLAY_NOTIFICATION"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
 
diff --git a/app/src/main/java/com/eleith/calchoochoo/data/PossibleTrain.java b/app/src/main/java/com/eleith/calchoochoo/data/PossibleTrain.java
index c236fa9..1b2840f 100644
--- a/app/src/main/java/com/eleith/calchoochoo/data/PossibleTrain.java
+++ b/app/src/main/java/com/eleith/calchoochoo/data/PossibleTrain.java
@@ -3,7 +3,7 @@ package com.eleith.calchoochoo.data;
 import org.joda.time.LocalTime;
 import org.parceler.Parcel;
 
-@Parcel
+@Parcel(Parcel.Serialization.BEAN)
 public class PossibleTrain {
   private String stopParentId;
   private String stopId;
diff --git a/app/src/main/java/com/eleith/calchoochoo/data/PossibleTrip.java b/app/src/main/java/com/eleith/calchoochoo/data/PossibleTrip.java
index a9214ce..180034b 100644
--- a/app/src/main/java/com/eleith/calchoochoo/data/PossibleTrip.java
+++ b/app/src/main/java/com/eleith/calchoochoo/data/PossibleTrip.java
@@ -3,7 +3,7 @@ package com.eleith.calchoochoo.data;
 import org.joda.time.LocalTime;
 import org.parceler.Parcel;
 
-@Parcel
+@Parcel(Parcel.Serialization.BEAN)
 public class PossibleTrip {
   private String firstStopId = "";
   private String firstStopName = "";
diff --git a/app/src/main/java/com/eleith/calchoochoo/data/Stop.java b/app/src/main/java/com/eleith/calchoochoo/data/Stop.java
index a11f376..3304259 100644
--- a/app/src/main/java/com/eleith/calchoochoo/data/Stop.java
+++ b/app/src/main/java/com/eleith/calchoochoo/data/Stop.java
@@ -6,7 +6,7 @@ import org.parceler.Parcel;
 
 import java.util.Comparator;
 
-@Parcel(analyze = Stop.class)
+@Parcel(Parcel.Serialization.BEAN)
 public class Stop {
   public String stop_id;
   public String stop_name;
@@ -21,9 +21,6 @@ public class Stop {
 
   private Location location;
 
-  public Stop() {
-  }
-
   public Location getLocation() {
     if (location == null) {
       location = new Location("");