Improves code consistency.

27 files changed, 109 insertions, 91 deletions

diff --git a/src/battlemap/src/Comm/CharacterTurn.elm b/src/battlemap/src/Comm/CharacterTurn.elm
index 050d24f..68f6c37 100644
--- a/src/battlemap/src/Comm/CharacterTurn.elm
+++ b/src/battlemap/src/Comm/CharacterTurn.elm
@@ -94,9 +94,7 @@ encode_actions model =
 
 try_encoding : Struct.Model.Type -> (Maybe Json.Encode.Value)
 try_encoding model =
-   case
-      (Struct.CharacterTurn.try_getting_active_character model.char_turn)
-   of
+   case (Struct.CharacterTurn.try_getting_active_character model.char_turn) of
       (Just char) ->
          (Just
             (Json.Encode.object
diff --git a/src/battlemap/src/Comm/LoadBattlemap.elm b/src/battlemap/src/Comm/LoadBattlemap.elm
index 8642ca0..97c2db2 100644
--- a/src/battlemap/src/Comm/LoadBattlemap.elm
+++ b/src/battlemap/src/Comm/LoadBattlemap.elm
@@ -4,10 +4,10 @@ module Comm.LoadBattlemap exposing (try)
 import Json.Encode
 
 -- Battlemap -------------------------------------------------------------------
-import Constants.IO
-
 import Comm.Send
 
+import Constants.IO
+
 import Struct.Event
 import Struct.Model
 
diff --git a/src/battlemap/src/Comm/TurnResults.elm b/src/battlemap/src/Comm/TurnResults.elm
index 359e3c9..abeb932 100644
--- a/src/battlemap/src/Comm/TurnResults.elm
+++ b/src/battlemap/src/Comm/TurnResults.elm
@@ -10,6 +10,7 @@ import Struct.TurnResult
 --------------------------------------------------------------------------------
 -- TYPES -----------------------------------------------------------------------
 --------------------------------------------------------------------------------
+
 --------------------------------------------------------------------------------
 -- LOCAL -----------------------------------------------------------------------
 --------------------------------------------------------------------------------
diff --git a/src/battlemap/src/ElmModule/Init.elm b/src/battlemap/src/ElmModule/Init.elm
index f8fb439..88e8441 100644
--- a/src/battlemap/src/ElmModule/Init.elm
+++ b/src/battlemap/src/ElmModule/Init.elm
@@ -1,5 +1,7 @@
 module ElmModule.Init exposing (init)
 
+-- Elm -------------------------------------------------------------------------
+
 -- Battlemap -------------------------------------------------------------------
 import Comm.LoadBattlemap
 
@@ -15,9 +17,7 @@ import Struct.Model
 --------------------------------------------------------------------------------
 init : (Struct.Model.Type, (Cmd Struct.Event.Type))
 init =
-   let
-      model = (Struct.Model.new)
-   in
+   let model = (Struct.Model.new) in
       (
          model,
          (case (Comm.LoadBattlemap.try model) of
diff --git a/src/battlemap/src/ElmModule/Subscriptions.elm b/src/battlemap/src/ElmModule/Subscriptions.elm
index c8126b1..f342b30 100644
--- a/src/battlemap/src/ElmModule/Subscriptions.elm
+++ b/src/battlemap/src/ElmModule/Subscriptions.elm
@@ -1,7 +1,17 @@
 module ElmModule.Subscriptions exposing (..)
 
+-- Elm -------------------------------------------------------------------------
+
+-- Battlemap -------------------------------------------------------------------
 import Struct.Model
 import Struct.Event
 
+--------------------------------------------------------------------------------
+-- LOCAL -----------------------------------------------------------------------
+--------------------------------------------------------------------------------
+
+--------------------------------------------------------------------------------
+-- EXPORTED --------------------------------------------------------------------
+--------------------------------------------------------------------------------
 subscriptions : Struct.Model.Type -> (Sub Struct.Event.Type)
 subscriptions model = Sub.none
diff --git a/src/battlemap/src/ElmModule/Update.elm b/src/battlemap/src/ElmModule/Update.elm
index 43b6476..3a01c23 100644
--- a/src/battlemap/src/ElmModule/Update.elm
+++ b/src/battlemap/src/ElmModule/Update.elm
@@ -20,6 +20,14 @@ import Update.SendLoadBattlemapRequest
 import Update.SwitchTeam
 import Update.SwitchWeapon
 
+--------------------------------------------------------------------------------
+-- LOCAL -----------------------------------------------------------------------
+--------------------------------------------------------------------------------
+
+--------------------------------------------------------------------------------
+-- EXPORTED --------------------------------------------------------------------
+--------------------------------------------------------------------------------
+
 update : (
       Struct.Event.Type ->
       Struct.Model.Type ->
diff --git a/src/battlemap/src/Struct/Battlemap.elm b/src/battlemap/src/Struct/Battlemap.elm
index 5a4c88c..700c46d 100644
--- a/src/battlemap/src/Struct/Battlemap.elm
+++ b/src/battlemap/src/Struct/Battlemap.elm
@@ -33,12 +33,12 @@ type alias Type =
 --------------------------------------------------------------------------------
 -- LOCAL -----------------------------------------------------------------------
 --------------------------------------------------------------------------------
-location_to_index : Type -> Struct.Location.Type -> Int
-location_to_index bmap loc =
+location_to_index : Struct.Location.Type -> Type -> Int
+location_to_index loc bmap =
    ((loc.y * bmap.width) + loc.x)
 
-has_location : Type -> Struct.Location.Type -> Bool
-has_location bmap loc =
+has_location : Struct.Location.Type -> Type -> Bool
+has_location loc bmap =
    (
       (loc.x >= 0)
       && (loc.y >= 0)
@@ -76,12 +76,12 @@ new width height tiles =
    }
 
 try_getting_tile_at : (
-      Type ->
       Struct.Location.Type ->
+      Type ->
       (Maybe Struct.Tile.Type)
    )
-try_getting_tile_at bmap loc =
-   (Array.get (location_to_index bmap loc) bmap.content)
+try_getting_tile_at loc bmap =
+   (Array.get (location_to_index loc bmap) bmap.content)
 
 get_movement_cost_function : (
       Type ->
@@ -91,11 +91,9 @@ get_movement_cost_function : (
       Int
    )
 get_movement_cost_function bmap start_loc char_list loc =
-   if (has_location bmap loc)
+   if (has_location loc bmap)
    then
-      case
-         (Array.get (location_to_index bmap loc) bmap.content)
-      of
+      case (Array.get (location_to_index loc bmap) bmap.content) of
          (Just tile) ->
             if
                (List.any
diff --git a/src/battlemap/src/Struct/Location.elm b/src/battlemap/src/Struct/Location.elm
index ab20fac..d284d05 100644
--- a/src/battlemap/src/Struct/Location.elm
+++ b/src/battlemap/src/Struct/Location.elm
@@ -25,8 +25,8 @@ type alias Ref = (Int, Int)
 --------------------------------------------------------------------------------
 -- EXPORTED --------------------------------------------------------------------
 --------------------------------------------------------------------------------
-neighbor : Type -> Struct.Direction.Type -> Type
-neighbor loc dir =
+neighbor : Struct.Direction.Type -> Type -> Type
+neighbor dir loc =
    case dir of
       Struct.Direction.Right -> {loc | x = (loc.x + 1)}
       Struct.Direction.Left -> {loc | x = (loc.x - 1)}
diff --git a/src/battlemap/src/Struct/Model.elm b/src/battlemap/src/Struct/Model.elm
index 4955163..545fd0f 100644
--- a/src/battlemap/src/Struct/Model.elm
+++ b/src/battlemap/src/Struct/Model.elm
@@ -69,20 +69,20 @@ add_character char model =
          )
    }
 
-reset : Type -> (Dict.Dict Struct.Character.Ref Struct.Character.Type) -> Type
-reset model characters =
+reset : (Dict.Dict Struct.Character.Ref Struct.Character.Type) -> Type -> Type
+reset characters model =
    {model |
       characters = characters,
       error = Nothing,
-      ui = (Struct.UI.set_previous_action model.ui Nothing),
+      ui = (Struct.UI.set_previous_action Nothing model.ui),
       char_turn = (Struct.CharacterTurn.new)
    }
 
-invalidate : Type -> Struct.Error.Type -> Type
-invalidate model err =
+invalidate : Struct.Error.Type -> Type -> Type
+invalidate err model =
    {model |
       error = (Just err),
-      ui = (Struct.UI.set_displayed_tab model.ui Struct.UI.StatusTab)
+      ui = (Struct.UI.set_displayed_tab Struct.UI.StatusTab model.ui)
    }
 
 clear_error : Type -> Type
diff --git a/src/battlemap/src/Struct/Navigator.elm b/src/battlemap/src/Struct/Navigator.elm
index a0640e0..1b3f170 100644
--- a/src/battlemap/src/Struct/Navigator.elm
+++ b/src/battlemap/src/Struct/Navigator.elm
@@ -14,6 +14,7 @@ module Struct.Navigator exposing
       try_adding_step,
       try_getting_path_to
    )
+
 -- Elm -------------------------------------------------------------------------
 import Dict
 
@@ -158,11 +159,11 @@ lock_path navigator =
    }
 
 try_adding_step : (
-      Type ->
       Struct.Direction.Type ->
+      Type ->
       (Maybe Type)
    )
-try_adding_step navigator dir =
+try_adding_step dir navigator =
    if (navigator.locked_path)
    then
       Nothing
@@ -178,11 +179,11 @@ try_adding_step navigator dir =
          Nothing -> Nothing
 
 try_getting_path_to : (
-      Type ->
       Struct.Location.Ref ->
+      Type ->
       (Maybe (List Struct.Direction.Type))
    )
-try_getting_path_to navigator loc_ref =
+try_getting_path_to loc_ref navigator =
    case (Dict.get loc_ref navigator.range_indicators) of
       (Just target) ->
          (Just (Struct.RangeIndicator.get_path target))
diff --git a/src/battlemap/src/Struct/Path.elm b/src/battlemap/src/Struct/Path.elm
index ba568c3..70f28ac 100644
--- a/src/battlemap/src/Struct/Path.elm
+++ b/src/battlemap/src/Struct/Path.elm
@@ -113,6 +113,7 @@ try_backtracking_to path dir location =
             )
          else
             Nothing
+
       (_, _) ->
          Nothing
 
@@ -151,8 +152,8 @@ try_following_direction cost_fun maybe_path dir =
          let
             next_location =
                (Struct.Location.neighbor
-                  path.current_location
                   dir
+                  path.current_location
                )
             next_location_cost = (cost_fun next_location)
          in
@@ -170,4 +171,5 @@ try_following_direction cost_fun maybe_path dir =
                   )
             else
                Nothing
+
       Nothing -> Nothing
diff --git a/src/battlemap/src/Struct/RangeIndicator.elm b/src/battlemap/src/Struct/RangeIndicator.elm
index c224db3..ed728c0 100644
--- a/src/battlemap/src/Struct/RangeIndicator.elm
+++ b/src/battlemap/src/Struct/RangeIndicator.elm
@@ -79,7 +79,7 @@ handle_neighbors : (
    )
 handle_neighbors src_indicator src_loc dist range results cost_fun dir rem =
    let
-      neighbor_loc = (Struct.Location.neighbor src_loc dir)
+      neighbor_loc = (Struct.Location.neighbor dir src_loc)
    in
       case (Dict.get (Struct.Location.get_ref neighbor_loc) results) of
          (Just _) -> rem
diff --git a/src/battlemap/src/Struct/UI.elm b/src/battlemap/src/Struct/UI.elm
index 3ae462c..6c6765c 100644
--- a/src/battlemap/src/Struct/UI.elm
+++ b/src/battlemap/src/Struct/UI.elm
@@ -73,15 +73,15 @@ get_zoom_level ui = ui.zoom_level
 reset_zoom_level : Type -> Type
 reset_zoom_level ui = {ui | zoom_level = 1.0}
 
-mod_zoom_level : Type -> Float -> Type
-mod_zoom_level ui mod = {ui | zoom_level = (mod * ui.zoom_level)}
+mod_zoom_level : Float -> Type -> Type
+mod_zoom_level mod ui = {ui | zoom_level = (mod * ui.zoom_level)}
 
 -- Tab -------------------------------------------------------------------------
 try_getting_displayed_tab : Type -> (Maybe Tab)
 try_getting_displayed_tab ui = ui.displayed_tab
 
-set_displayed_tab : Type -> Tab -> Type
-set_displayed_tab ui tab = {ui | displayed_tab = (Just tab)}
+set_displayed_tab : Tab -> Type -> Type
+set_displayed_tab tab ui = {ui | displayed_tab = (Just tab)}
 
 reset_displayed_tab : Type -> Type
 reset_displayed_tab ui = {ui | displayed_tab = Nothing}
@@ -110,15 +110,15 @@ toggle_manual_controls ui =
    else
       {ui | show_manual_controls = True}
 
-set_enable_manual_controls : Type -> Bool -> Type
-set_enable_manual_controls ui val = {ui | show_manual_controls = val}
+set_enable_manual_controls : Bool -> Type -> Type
+set_enable_manual_controls val ui = {ui | show_manual_controls = val}
 
 -- Previous Action -------------------------------------------------------------
 has_focus : Type -> Bool
 has_focus ui = True
 
-set_previous_action : Type -> (Maybe Action) -> Type
-set_previous_action ui act = {ui | previous_action = act}
+set_previous_action : (Maybe Action) -> Type -> Type
+set_previous_action act ui = {ui | previous_action = act}
 
 get_previous_action : Type -> (Maybe Action)
 get_previous_action ui = ui.previous_action
diff --git a/src/battlemap/src/Update/AttackWithoutMoving.elm b/src/battlemap/src/Update/AttackWithoutMoving.elm
index 639d90e..7e0d154 100644
--- a/src/battlemap/src/Update/AttackWithoutMoving.elm
+++ b/src/battlemap/src/Update/AttackWithoutMoving.elm
@@ -32,7 +32,6 @@ apply_to model =
       _ ->
          (
             (Struct.Model.invalidate
-               model
                (Struct.Error.new
                   Struct.Error.Programming
                   (
@@ -40,6 +39,7 @@ apply_to model =
                      ++ "character being selected."
                   )
                )
+               model
             ),
             Cmd.none
          )
diff --git a/src/battlemap/src/Update/ChangeScale.elm b/src/battlemap/src/Update/ChangeScale.elm
index 55cb547..a2e10ce 100644
--- a/src/battlemap/src/Update/ChangeScale.elm
+++ b/src/battlemap/src/Update/ChangeScale.elm
@@ -23,4 +23,4 @@ apply_to model mod =
    then
       ({model | ui = (Struct.UI.reset_zoom_level model.ui)}, Cmd.none)
    else
-      ({model | ui = (Struct.UI.mod_zoom_level model.ui mod)}, Cmd.none)
+      ({model | ui = (Struct.UI.mod_zoom_level mod model.ui)}, Cmd.none)
diff --git a/src/battlemap/src/Update/DisplayCharacterInfo.elm b/src/battlemap/src/Update/DisplayCharacterInfo.elm
index 55c49e8..25ddb6c 100644
--- a/src/battlemap/src/Update/DisplayCharacterInfo.elm
+++ b/src/battlemap/src/Update/DisplayCharacterInfo.elm
@@ -24,11 +24,11 @@ apply_to model target_ref =
       {model |
          ui =
             (Struct.UI.set_displayed_tab
+               Struct.UI.StatusTab
                (Struct.UI.set_previous_action
-                  model.ui
                   (Just (Struct.UI.SelectedCharacter target_ref))
+                  model.ui
                )
-               Struct.UI.StatusTab
             )
       },
       Cmd.none
diff --git a/src/battlemap/src/Update/EndTurn.elm b/src/battlemap/src/Update/EndTurn.elm
index c583b16..173a713 100644
--- a/src/battlemap/src/Update/EndTurn.elm
+++ b/src/battlemap/src/Update/EndTurn.elm
@@ -27,7 +27,6 @@ make_it_so model char nav =
       (Just cmd) ->
          (
             (Struct.Model.reset
-               model
                (Dict.update
                   (Struct.Character.get_ref char)
                   (\maybe_char ->
@@ -46,6 +45,7 @@ make_it_so model char nav =
                   )
                   model.characters
                )
+               model
             ),
             cmd
          )
@@ -87,11 +87,11 @@ apply_to model =
       (_, _, _) ->
          (
             (Struct.Model.invalidate
-               model
                (Struct.Error.new
                   Struct.Error.Programming
                   "Character turn appears to be in an illegal state."
                )
+               model
             ),
             Cmd.none
          )
diff --git a/src/battlemap/src/Update/HandleServerReply.elm b/src/battlemap/src/Update/HandleServerReply.elm
index 8b3ae27..f0846db 100644
--- a/src/battlemap/src/Update/HandleServerReply.elm
+++ b/src/battlemap/src/Update/HandleServerReply.elm
@@ -80,8 +80,8 @@ add_to_timeline turn_results current_state =
                      ),
                   ui =
                      (Struct.UI.set_displayed_tab
-                        model.ui
                         Struct.UI.TimelineTab
+                        model.ui
                      ),
                   characters = updated_characters
                },
@@ -137,8 +137,8 @@ apply_to model query_result =
       (Result.Err error) ->
          (
             (Struct.Model.invalidate
-               model
                (Struct.Error.new Struct.Error.Networking (toString error))
+               model
             ),
             Cmd.none
          )
@@ -148,7 +148,7 @@ apply_to model query_result =
             (
                case (List.foldl (apply_command) (model, Nothing) commands) of
                   (updated_model, Nothing) -> updated_model
-                  (_, (Just error)) -> (Struct.Model.invalidate model error)
+                  (_, (Just error)) -> (Struct.Model.invalidate error model)
             ),
             Cmd.none
          )
diff --git a/src/battlemap/src/Update/RequestDirection.elm b/src/battlemap/src/Update/RequestDirection.elm
index 605632e..ce6084b 100644
--- a/src/battlemap/src/Update/RequestDirection.elm
+++ b/src/battlemap/src/Update/RequestDirection.elm
@@ -21,7 +21,7 @@ make_it_so : (
       Struct.Model.Type
    )
 make_it_so model navigator dir =
-   case (Struct.Navigator.try_adding_step navigator dir) of
+   case (Struct.Navigator.try_adding_step dir navigator) of
       (Just new_navigator) ->
          {model |
             char_turn =
@@ -31,18 +31,18 @@ make_it_so model navigator dir =
                ),
             ui =
                (Struct.UI.set_previous_action
-                  model.ui
                   (Just Struct.UI.UsedManualControls)
+                  model.ui
                )
          }
 
       Nothing ->
          (Struct.Model.invalidate
-            model
             (Struct.Error.new
                Struct.Error.IllegalAction
                "Unreachable/occupied tile."
             )
+            model
          )
 
 --------------------------------------------------------------------------------
@@ -66,11 +66,11 @@ apply_to model dir =
       _ ->
          (
             (Struct.Model.invalidate
-               model
                (Struct.Error.new
                   Struct.Error.IllegalAction
                   "This can only be done while moving a character."
                )
+               model
             ),
             Cmd.none
          )
diff --git a/src/battlemap/src/Update/SelectCharacter.elm b/src/battlemap/src/Update/SelectCharacter.elm
index cc83f6b..1e2c2df 100644
--- a/src/battlemap/src/Update/SelectCharacter.elm
+++ b/src/battlemap/src/Update/SelectCharacter.elm
@@ -35,7 +35,7 @@ attack_character model target_char_id target_char =
          ),
       ui =
          (Struct.UI.reset_displayed_tab
-            (Struct.UI.set_previous_action model.ui Nothing)
+            (Struct.UI.set_previous_action Nothing model.ui)
          )
    }
 
@@ -77,15 +77,15 @@ ctrl_or_focus_character model target_char_id target_char =
                ),
             ui =
                (Struct.UI.reset_displayed_tab
-                  (Struct.UI.set_previous_action model.ui Nothing)
+                  (Struct.UI.set_previous_action Nothing model.ui)
                )
          }
    else
       {model |
          ui =
             (Struct.UI.set_previous_action
-               model.ui
                (Just (Struct.UI.SelectedCharacter target_char_id))
+               model.ui
             )
       }
 
@@ -108,10 +108,10 @@ can_target_character model target =
             (Just nav) ->
                case
                   (Struct.Navigator.try_getting_path_to
-                     nav
                      (Struct.Location.get_ref
                         (Struct.Character.get_location target)
                      )
+                     nav
                   )
                of
                   (Just _) -> True
@@ -161,11 +161,11 @@ double_clicked_character model target_char_id =
       Nothing ->
          (
             (Struct.Model.invalidate
-               model
                (Struct.Error.new
                   Struct.Error.Programming
                   "SelectCharacter: Unknown char selected."
                )
+               model
             ),
             Cmd.none
          )
@@ -192,11 +192,11 @@ apply_to model target_char_id =
          {model |
             ui =
                (Struct.UI.set_previous_action
+                  (Just (Struct.UI.SelectedCharacter target_char_id))
                   (Struct.UI.set_displayed_tab
-                     model.ui
                      Struct.UI.StatusTab
+                     model.ui
                   )
-                  (Just (Struct.UI.SelectedCharacter target_char_id))
                )
          },
          Cmd.none
diff --git a/src/battlemap/src/Update/SelectTab.elm b/src/battlemap/src/Update/SelectTab.elm
index 8a5291e..c25ec56 100644
--- a/src/battlemap/src/Update/SelectTab.elm
+++ b/src/battlemap/src/Update/SelectTab.elm
@@ -27,6 +27,6 @@ apply_to model tab =
       )
    else
       (
-         {model | ui = (Struct.UI.set_displayed_tab model.ui tab)},
+         {model | ui = (Struct.UI.set_displayed_tab tab model.ui)},
          Cmd.none
       )
diff --git a/src/battlemap/src/Update/SelectTile.elm b/src/battlemap/src/Update/SelectTile.elm
index 3219873..fc6db27 100644
--- a/src/battlemap/src/Update/SelectTile.elm
+++ b/src/battlemap/src/Update/SelectTile.elm
@@ -23,7 +23,7 @@ try_autopiloting : (
 try_autopiloting dir maybe_nav =
    case maybe_nav of
       (Just navigator) ->
-         (Struct.Navigator.try_adding_step navigator dir)
+         (Struct.Navigator.try_adding_step dir navigator)
 
       Nothing -> Nothing
 
@@ -65,11 +65,11 @@ go_to_tile model navigator loc_ref =
             {model |
                ui =
                   (Struct.UI.set_displayed_tab
+                     Struct.UI.StatusTab
                      (Struct.UI.set_previous_action
-                        model.ui
                         (Just (Struct.UI.SelectedLocation loc_ref))
+                        model.ui
                      )
-                     Struct.UI.StatusTab
                   )
             },
             Cmd.none
@@ -78,8 +78,8 @@ go_to_tile model navigator loc_ref =
       -- We have to try getting there.
       case
          (Struct.Navigator.try_getting_path_to
-            navigator
             loc_ref
+            navigator
          )
       of
          (Just path) ->
@@ -100,11 +100,11 @@ go_to_tile model navigator loc_ref =
                            ),
                         ui =
                            (Struct.UI.set_displayed_tab
+                              Struct.UI.StatusTab
                               (Struct.UI.set_previous_action
-                                 model.ui
                                  (Just (Struct.UI.SelectedLocation loc_ref))
+                                 model.ui
                               )
-                              Struct.UI.StatusTab
                            )
                      },
                      Cmd.none
@@ -113,17 +113,17 @@ go_to_tile model navigator loc_ref =
                Nothing ->
                   (
                      (Struct.Model.invalidate
-                        model
                         (Struct.Error.new
                            Struct.Error.Programming
                            "SelectTile/Navigator: Could not follow own path."
                         )
+                        model
                      ),
                      Cmd.none
                   )
 
          Nothing -> -- Clicked outside of the range indicator
-            ((Struct.Model.reset model model.characters), Cmd.none)
+            ((Struct.Model.reset model.characters model), Cmd.none)
 
 --------------------------------------------------------------------------------
 -- EXPORTED --------------------------------------------------------------------
@@ -143,11 +143,11 @@ apply_to model loc_ref =
             {model |
                ui =
                   (Struct.UI.set_displayed_tab
+                     Struct.UI.StatusTab
                      (Struct.UI.set_previous_action
-                        model.ui
                         (Just (Struct.UI.SelectedLocation loc_ref))
+                        model.ui
                      )
-                     Struct.UI.StatusTab
                   )
             },
             Cmd.none
diff --git a/src/battlemap/src/Update/SwitchTeam.elm b/src/battlemap/src/Update/SwitchTeam.elm
index ec54369..dec3348 100644
--- a/src/battlemap/src/Update/SwitchTeam.elm
+++ b/src/battlemap/src/Update/SwitchTeam.elm
@@ -21,20 +21,16 @@ apply_to model =
    then
       (
          (Struct.Model.reset
-            {model |
-               player_id = "1"
-            }
             model.characters
+            {model | player_id = "1"}
          ),
          Cmd.none
       )
    else
       (
          (Struct.Model.reset
-            {model |
-               player_id = "0"
-            }
             model.characters
+            {model | player_id = "0"}
          ),
          Cmd.none
       )
diff --git a/src/battlemap/src/Update/SwitchWeapon.elm b/src/battlemap/src/Update/SwitchWeapon.elm
index 7921b66..8af4fe3 100644
--- a/src/battlemap/src/Update/SwitchWeapon.elm
+++ b/src/battlemap/src/Update/SwitchWeapon.elm
@@ -62,7 +62,6 @@ make_it_so model =
 
       _ ->
          (Struct.Model.invalidate
-            model
             (Struct.Error.new
                Struct.Error.Programming
                (
@@ -70,6 +69,7 @@ make_it_so model =
                   ++ " without character being selected."
                )
             )
+            model
          )
 
 --------------------------------------------------------------------------------
@@ -87,7 +87,6 @@ apply_to model =
       _ ->
          (
             (Struct.Model.invalidate
-               model
                (Struct.Error.new
                   Struct.Error.Programming
                   (
@@ -95,6 +94,7 @@ apply_to model =
                      ++ " without character being selected."
                   )
                )
+               model
             ),
             Cmd.none
          )
diff --git a/src/battlemap/src/View/Battlemap/Navigator.elm b/src/battlemap/src/View/Battlemap/Navigator.elm
index d400659..85a3bea 100644
--- a/src/battlemap/src/View/Battlemap/Navigator.elm
+++ b/src/battlemap/src/View/Battlemap/Navigator.elm
@@ -96,7 +96,7 @@ path_node_get_html : (
    )
 path_node_get_html is_below_markers next_dir (curr_loc, curr_dir, curr_nodes) =
    (
-      (Struct.Location.neighbor curr_loc next_dir),
+      (Struct.Location.neighbor next_dir curr_loc),
       next_dir,
       (
          (Html.div
diff --git a/src/battlemap/src/View/SubMenu/Status.elm b/src/battlemap/src/View/SubMenu/Status.elm
index 031f795..feb5097 100644
--- a/src/battlemap/src/View/SubMenu/Status.elm
+++ b/src/battlemap/src/View/SubMenu/Status.elm
@@ -74,7 +74,7 @@ get_tile_info_html : (
       (Html.Html Struct.Event.Type)
    )
 get_tile_info_html model loc =
-   case (Struct.Battlemap.try_getting_tile_at model.battlemap loc) of
+   case (Struct.Battlemap.try_getting_tile_at loc model.battlemap) of
       (Just tile) ->
          (Html.div
             [
diff --git a/src/battlemap/www/style.css b/src/battlemap/www/style.css
index dfbfdc4..66ecd12 100644
--- a/src/battlemap/www/style.css
+++ b/src/battlemap/www/style.css
@@ -26,7 +26,7 @@
 
    padding: 0.5em;
 
-   background-color: rgba(145,124,111,1);
+   background-color: #917C6F;
 
    margin: 0 1em 0 1em;
 }
@@ -43,7 +43,7 @@
    padding: 0.5em;
    margin: 0 1em 0 1em;
 
-   background-color: rgba(145,124,111,1);
+   background-color: #917C6F;
 }
 
 
@@ -80,7 +80,7 @@
    border-radius: 0 15px 15px 0;
    border-left: none;
 
-   background-color: rgba(145,124,111,1);
+   background-color: #917C6F;
 }
 
 .battlemap-sub-menu
@@ -95,7 +95,7 @@
    border-radius: 15px 0 0 15px;
    border-right: none;
 
-   background-color: rgba(145,124,111,1);
+   background-color: #917C6F;
 }
 
 /******************************************************************************/
@@ -103,7 +103,7 @@
 /******************************************************************************/
 .battlemap-error
 {
-   background-color: rgba(85,0,0,1);
+   background-color: #550000;
 }
 
 .battlemap-manual-controls
@@ -261,7 +261,7 @@
 
    /*** Otherwise, it won't display correctly without 'transform: scale' ***/
    position: relative;
-   background-color: rgba(145,124,111,1);
+   background-color: #917C6F;
 }
 
 .battlemap-tiled
@@ -421,8 +421,6 @@
    transform: rotate(180deg);
 }
 
-.battlemap-path-icon-NR,
-.battlemap-path-icon-NL,
 .battlemap-path-icon-RR,
 .battlemap-path-icon-LR,
 .battlemap-path-icon-RL,
@@ -431,8 +429,15 @@
    background-position: 0 0;
 }
 
+.battlemap-path-icon-markN,
 .battlemap-path-icon-NU,
 .battlemap-path-icon-ND,
+.battlemap-path-icon-NL,
+.battlemap-path-icon-NR
+{
+   display: none;
+}
+
 .battlemap-path-icon-UU,
 .battlemap-path-icon-UD,
 .battlemap-path-icon-DU,
@@ -442,7 +447,6 @@
    transform: rotate(90deg);
 }
 
-.battlemap-path-icon-markN,
 .battlemap-path-icon-markR,
 .battlemap-path-icon-markL,
 .battlemap-path-icon-markU,