diff --git a/EXE/FLSharp.dll b/EXE/FLSharp.dll
index 05dfaa7e..d28aa968 100644
Binary files a/EXE/FLSharp.dll and b/EXE/FLSharp.dll differ
diff --git a/EXE/FLSharp.ini b/EXE/FLSharp.ini
index c0b28ff5..260ba511 100644
--- a/EXE/FLSharp.ini
+++ b/EXE/FLSharp.ini
@@ -5,8 +5,11 @@
 ; Also fixes a bug where the client doesn't send the right engine state to the server.
 better_updates = true
 ; Prevents waypoints from being cleared when the player reaches the coordinates in a different system.
-; Also makes it so that the player ship cannot be selected as a waypoint target on the nav map.
+; Makes it so that the player ship cannot be selected as a waypoint target on the nav map.
 waypoint_fixes = true
+; Fixes waypoints being called "Unknown Object" in the target view and Current Information window.
+; Fixes information about waypoints being printed incorrectly in the Current Information window.
+waypoint_name_fixes = true
 ; Fixes a bug where multi-barrel launchers do not play their one-shot sound.
 projectiles_sound_fix = true
 ; Fixes a bug on the client and server where multi-barrel launchers do not decrement the correct amount of ammo.
@@ -21,7 +24,7 @@ trade_lane_lights_fix = true
 ; Allows the Ctrl + C key to copy text from any in-game input box to the clipboard.
 ; Also allows for the Ctrl + V key to copy text from the clipboard to any in-game input box.
 copy_paste_feature = true
-; Fixes a minor bug where in some Multiplayer menus the slide-out animation of the buttons happened incorrectly.
+; Fixes a minor bug where in some Multiplayer menus the slide-out animation of the buttons happens incorrectly.
 slide_ui_anim_fix = true
 ; Fixes a bug that causes weapon animations to not work; i.e. enables weapon animations.
 ; Also allows a weapon animation to be played on the parent of the weapon.
@@ -32,5 +35,46 @@ flash_particle_fix = true
 print_rep_requirements = true
 ; Fixes a bug that causes the Freelancer process to not always terminate after exiting the game.
 post_game_deadlock_fix = true
+; Fixes Freelancer sometimes getting stuck in the message loop after the "Quit" message is retrieved.
+quit_message_fix = true
 ; Makes sure auto level and rotation lock are set to the default value when launching to space to prevent issues related to the flight controls.
 flight_controls_fix = true
+; Allows infocards for dynamic solars to be displayed in the Current Information window.
+; Show a fallback infocard based on the solar's archetype in the Current Information window if the solar itself has no infocard.
+dynamic_solar_infocards = true
+; Fixes a startup crash that occurs when FL tries to load a modded/malformed save file.
+; Also fixes a crash when selecting a modded/malformed save file in the F1 Load Game menu.
+save_crash_fix = true
+; Fixes a very rare and inconsistent crash in alchemy.dll.
+alchemy_crash_fix = true
+; Fixes ships with the fc_uk_grp faction assigned having a blank faction name in the Current Information window.
+blank_faction_fix = true
+; Fixes a crash that sometimes happens when closing the Server Filter dialog.
+server_filter_crash_fix = true
+; Fixes a bug that causes the game speed to sometimes suddenly increase when opening the Server Filter dialog.
+server_filter_speed_fix = true
+; Fixes Freelancer and FLServer crashing if a non-existing DLL is loaded via freelancer.ini.
+freelancer_dll_crash_fix = true
+; Shows the actual shield capacity value in the shield infocards (reduced by the offline_threshold value).
+shield_capacity_fix = true
+; Fixes the equipment and commodity dealer menus not opening when clicking the dealer twice.
+dealer_menu_open_fix = true
+; Fixes some crashes that can occur when opening the dealer menus.
+dealer_crash_fix = true
+; No longer kick players from the server for re-purchasing the same ship.
+ship_buy_kick_fix = true
+; Allows the player to enter formation with hostile group members.
+hostile_group_formation = true
+; Prevents hostile group members from being shown as hostile.
+unhostile_group_members = true
+; Shows the "GROUP MEMBER" attitude for group members in the Current Information window.
+group_member_attitude = true
+; Adds custom targeting cursor colors for group members and players who sent a trade request.
+more_cursor_colors = true
+; Fixes the first entry of every sold item category being misaligned in the Current Information window on some resolutions.
+base_info_spacing_fix = true
+; Fixes the in-game mouse cursor remaining visible when the cursor is outside the window.
+; Also fixes the Windows mouse cursor flickering when it touches the screen borders in borderless windowed mode.
+mouse_fix = true
+; Fixes pilots with long names having their name truncated in the Current Information window, comm text, and the "Hand over your cargo" dialog.
+pilot_names_fix = true
diff --git a/EXE/flplusplus.dll b/EXE/flplusplus.dll
index 56d52fb8..1a1da500 100644
Binary files a/EXE/flplusplus.dll and b/EXE/flplusplus.dll differ
diff --git a/EXE/flplusplus.ini b/EXE/flplusplus.ini
index 8052c579..2b6ef278 100644
--- a/EXE/flplusplus.ini
+++ b/EXE/flplusplus.ini
@@ -1,21 +1,58 @@
 ; Settings file for flplusplus
 [flplusplus]
-; Multiplier for render distance and the distance at which LODs are switched.
-; Supports decimal values
-; 0 = maximized
-; 1 = no change from vanilla Freelancer
+; Multiplier for maximum render distance and the distance at which LODs are switched.
+; The maximum render distances are scaled from the float values which are specified at file offsets 213EC8 and 1C8910 in Freelancer.exe.
+; Supports decimal values.
+; 1 = use the default values (no scaling)
 ; 2 = Double render distance & LOD switch threshold
 ; 3.5 = 3.5x render distance & LOD switch threshold, etc.
-lod_scale = 2
-pbubble_scale = 2
-character_detail_scale = 2
-; save_folder_name
+; Adjusting asteroid_dist_scale may cause bad performance and other issues; try at your own risk.
+lod_scale = 15
+pbubble_scale = 15
+character_detail_scale = 15
+asteroid_dist_scale = 1
 ; Name of the save folder in Documents/My Games
 save_folder_name = Freelancer
-; save_in_directory
 ; if true, save in the game directory (EXE/../SAVE) instead of Documents/My Games
 save_in_directory = true
+; Name of the screenshots folder in Pictures
+screenshots_folder_name = FreelancerShots
+; if true, screenshots are saved in the game directory (EXE/../SCREENSHOTS) instead of Pictures
+screenshots_in_directory = false
+; Uses alternative code for taking .png screenshots if Freelancer is running in fullscreen mode.
+; By default this option is set to true if Freelancer is run through Wine, false if otherwise.
+; If screenshots in fullscreen mode come out as fully black, changing this option's value might help.
+;alternative_fullscreen_screenshots_code = false
+; Uses alternative code for taking .png screenshots if Freelancer is running in fullscreen mode.
+; Try setting this to true if screenshots in windowed mode come out as fully black.
+alternative_windowed_screenshots_code = false
 ; Patch out "Failed to get start location" warning
 remove_start_location_warning = true
 ; Log spew to a console window
 log_to_console = false
+; Scrolling speed when zooming in/out in the ship preview window
+; Setting this value to 0 disables this scrolling feature entirely
+ship_preview_scrolling_speed = 3
+; Reverse scrolling direction when zooming in/out in the ship preview window
+ship_preview_scrolling_inverse = false
+; The minimum distance the player can zoom to the ship. Can be negative to allow for zooming "through" the ship.
+ship_preview_scrolling_min_distance = 0
+; The maximum distance the player can zoom away from the ship.
+ship_preview_scrolling_max_distance = 100
+; Regenerates the Restart.fl file on every launch to prevent crashes when the file is malformed or from another mod
+always_regenerate_restart_file = true
+; Changes the IDS of the message shown on startup if the game failed to init the saves directory.
+; In vanilla FL, the message says "The account name and password you provided are not valid on this server.",
+; so it's better to change this to something more relevant and descriptive.
+failed_to_init_saves_dir_ids = 458802
+; Fixes touchpad scrolling but breaks mouse wheel scrolling.
+; Enabling this is only useful if you're planning to play Freelancer on a laptop without a mouse.
+touchpad_support = false
+; Confines/locks the mouse cursor to the game window.
+; This prevents the in-game cursor from leaving the game window.
+confine_cursor = true
+
+; List of server IPs that will be added to the server list on startup.
+; Basically does the same thing as the "-s" shortcut switch.
+[direct_ips]
+127.0.0.1:2302
\ No newline at end of file
diff --git a/EXE/flplusplus_backup.dll b/EXE/flplusplus_backup.dll
new file mode 100644
index 00000000..56d52fb8
Binary files /dev/null and b/EXE/flplusplus_backup.dll differ