diff --git a/src/application.cpp b/src/application.cpp
index 24225f4..bb025c0 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -29,12 +29,14 @@
 #include <thread>
 #include <string>
 #include <iomanip>
+#include <filesystem>
 
 // External
 #include <glad/glad.h>
 #include <SDL2/SDL.h>
 #include "stb/stb_image_write.h"
 #include <physfs.h>
+#include <cxxopts.hpp>
 
 // Debug
 #include "debug/ansi-codes.hpp"
@@ -112,8 +114,9 @@ using namespace vmq::operators;
 
 application::application(int argc, char** argv):
 	closed(false),
-	exit_status(EXIT_SUCCESS)
-{
+	exit_status(EXIT_SUCCESS),
+	initial_state(nullptr)
+{	
 	// Format log messages
 	logger.set_warning_prefix("Warning: ");
 	logger.set_error_prefix(std::string());
@@ -128,8 +131,8 @@ application::application(int argc, char** argv):
 	#endif
 	
 	// Detect resource paths
-	data_path = get_data_path(application_name) + "data/";
-	data_package_path = get_data_path(application_name) + "data.zip";
+	data_path = get_data_path(application_name);
+	data_package_path = data_path + "data.zip";
 	config_path = get_config_path(application_name);
 	mods_path = config_path + "mods/";
 	saves_path = config_path + "saves/";
@@ -168,6 +171,17 @@ application::application(int argc, char** argv):
 		logger.redirect(&log_filestream);
 	#endif
 	
+	// Setup FSM
+	setup_fsm();
+	
+	// Load configuration
+	//load_config();
+	fullscreen = true;
+	vsync = false;
+	
+	// Parse command line options
+	parse_options(argc, argv);
+	
 	// Init PhysicsFS
 	logger.push_task("Initializing PhysicsFS");
 	if (!PHYSFS_init(argv[0]))
@@ -299,15 +313,14 @@ application::application(int argc, char** argv):
 		display_dimensions = {sdl_display_mode.w, sdl_display_mode.h};
 	}
 
-	int window_width = 1920;
-	int window_height = 1080;
-	fullscreen = true;
-	
-	
-	window_width = 1280;
-	window_height = 720;
-	fullscreen = false;
+	int window_width = sdl_display_mode.w;
+	int window_height = sdl_display_mode.h;	
 	
+	if (!fullscreen)
+	{
+		window_width = 1280;
+		window_height = 720;
+	}	
 	
 	viewport = {0.0f, 0.0f, static_cast<float>(window_width), static_cast<float>(window_height)};
 	
@@ -361,7 +374,7 @@ application::application(int argc, char** argv):
 	}
 
 	// Set v-sync mode
-	int swap_interval = 0;
+	int swap_interval = (vsync) ? 1 : 0;
 	logger.push_task((swap_interval) ? "Enabling v-sync" : "Disabling v-sync");
 	if (SDL_GL_SetSwapInterval(swap_interval) != 0)
 	{
@@ -608,38 +621,6 @@ application::application(int argc, char** argv):
 	systems.push_back([this](double t, double dt){ this->animator->animate(dt); });
 	systems.push_back([this](double t, double dt){ this->application_controls.update(); this->menu_controls.update(); this->camera_controls->update(); });
 
-	// Setup FSM states
-	loading_state =
-	{
-		std::function<void()>(std::bind(enter_loading_state, this)),
-		std::function<void()>(std::bind(exit_loading_state, this))
-	};
-	language_select_state =
-	{
-		std::function<void()>(std::bind(enter_language_select_state, this)),
-		std::function<void()>(std::bind(exit_language_select_state, this))
-	};
-	splash_state =
-	{
-		std::function<void()>(std::bind(enter_splash_state, this)),
-		std::function<void()>(std::bind(exit_splash_state, this))
-	};
-	title_state =
-	{
-		std::function<void()>(std::bind(enter_title_state, this)),
-		std::function<void()>(std::bind(exit_title_state, this))
-	};
-	play_state =
-	{
-		std::function<void()>(std::bind(enter_play_state, this)),
-		std::function<void()>(std::bind(exit_play_state, this))
-	};
-	pause_state =
-	{
-		std::function<void()>(std::bind(enter_pause_state, this)),
-		std::function<void()>(std::bind(exit_pause_state, this))
-	};
-
 	// Setup frame timing
 	frame_scheduler.set_update_callback(std::bind(&application::update, this, std::placeholders::_1, std::placeholders::_2));
 	frame_scheduler.set_render_callback(std::bind(&application::render, this, std::placeholders::_1));
@@ -950,19 +931,6 @@ application::application(int argc, char** argv):
 	//std::string cmd = "cue 20 exit";
 	//logger.log(cmd);
 	//logger.log(cli.interpret(cmd));
-	
-	// Determine initial state
-	// Determine initial state
-	initial_state = &splash_state;
-	std::string no_splash_flag = "--no-splash";
-	for (int i = 0; i < argc; ++i)
-	{
-		if (no_splash_flag == argv[i])
-		{
-			initial_state = &play_state;
-			break;
-		}
-	}
 }
 
 application::~application()
@@ -1024,6 +992,145 @@ int application::execute()
 	return exit_status;
 }
 
+void application::setup_fsm()
+{
+	loading_state =
+	{
+		std::function<void()>(std::bind(enter_loading_state, this)),
+		std::function<void()>(std::bind(exit_loading_state, this))
+	};
+	
+	language_select_state =
+	{
+		std::function<void()>(std::bind(enter_language_select_state, this)),
+		std::function<void()>(std::bind(exit_language_select_state, this))
+	};
+	
+	splash_state =
+	{
+		std::function<void()>(std::bind(enter_splash_state, this)),
+		std::function<void()>(std::bind(exit_splash_state, this))
+	};
+	
+	title_state =
+	{
+		std::function<void()>(std::bind(enter_title_state, this)),
+		std::function<void()>(std::bind(exit_title_state, this))
+	};
+	
+	play_state =
+	{
+		std::function<void()>(std::bind(enter_play_state, this)),
+		std::function<void()>(std::bind(exit_play_state, this))
+	};
+	
+	pause_state =
+	{
+		std::function<void()>(std::bind(enter_pause_state, this)),
+		std::function<void()>(std::bind(exit_pause_state, this))
+	};
+	
+	initial_state = &splash_state;
+}
+
+void application::parse_options(int argc, char** argv)
+{
+	cxxopts::Options options("Antkeeper", "Ant colony simulation game");
+	
+	options.add_options()
+		("q,quick-start", "Skips splash screen")
+		("c,continue", "Continues from last save")
+		("n,new-game", "Starts a new game")
+		("r,reset", "Restores all settings to default")
+		("f,fullscreen", "Starts in fullscreen mode")
+		("w,windowed", "Starts in windowed mode")
+		("v,vsync", "Enables or disables v-sync", cxxopts::value<int>())
+		("d,data", "Specifies the data package path", cxxopts::value<std::string>())
+		;
+	
+	logger.push_task("Parsing command line options");
+	
+	try
+	{
+		auto result = options.parse(argc, argv);
+		
+		// --quick-start
+		if (result.count("quick-start"))
+		{
+			logger.log("Skipping splash screen");
+			initial_state = &play_state;
+		}
+		
+		// --continue
+		if (result.count("continue"))
+		{
+			logger.log("Continuing from last save");
+		}
+		
+		// --new-game
+		if (result.count("new-game"))
+		{
+			logger.log("Starting a new game");
+		}
+		
+		// --reset
+		if (result.count("reset"))
+		{
+			logger.log("Restoring all settings to default");
+		}
+		
+		// --fullscreen
+		if (result.count("fullscreen"))
+		{
+			logger.log("Starting in fullscreen mode");
+			fullscreen = true;
+		}
+		
+		// --windowed
+		if (result.count("windowed"))
+		{
+			logger.log("Starting in windowed mode");
+			fullscreen = false;
+		}
+		
+		// --vsync
+		if (result.count("vsync"))
+		{
+			if (result["vsync"].as<int>())
+			{
+				logger.log("Turning on v-sync");
+				vsync = true;
+			}
+			else
+			{
+				logger.log("Turning off v-sync");
+				vsync = false;
+			}
+		}
+		
+		// --data
+		if (result.count("data"))
+		{
+			data_package_path = result["data"].as<std::string>();
+			
+			if (std::filesystem::path(data_package_path).is_relative())
+			{
+				data_package_path = data_path + data_package_path;
+			}
+			
+			logger.log("Set alternative data package path \"" + data_package_path + "\"");
+		}
+	}
+	catch (const std::exception& e)
+	{
+		logger.error("Exception caught: \"" + std::string(e.what()) + "\"");
+		logger.pop_task(EXIT_FAILURE);
+		return;
+	}
+	
+	logger.pop_task(EXIT_SUCCESS);
+}
+
 void application::update(double t, double dt)
 {
 	// Update time tween
diff --git a/src/application.hpp b/src/application.hpp
index 4a8f821..085fff5 100644
--- a/src/application.hpp
+++ b/src/application.hpp
@@ -187,6 +187,10 @@ public:
 	screen_transition* get_radial_transition_outer();
 
 private:
+	void setup_fsm();
+	void parse_options(int argc, char** argv);
+	
+
 	void update(double t, double dt);
 	void render(double alpha);
 	void translate_sdl_events();
@@ -196,6 +200,7 @@ private:
 	static void save_image(const std::string& filename, int w, int h, const unsigned char* pixels);
 
 	bool fullscreen;
+	bool vsync;
 	std::tuple<int, int> saved_mouse_position;
 	std::tuple<int, int> window_dimensions;
 	std::tuple<int, int> window_position;
@@ -351,6 +356,12 @@ private:
 	screen_transition* fade_transition;
 	screen_transition* radial_transition_inner;
 	screen_transition* radial_transition_outer;
+	
+	// Entities
+	entt::entity forceps_entity;
+	entt::entity lens_entity;
+	entt::entity brush_entity;
+	entt::entity flashlight_entity;
 };
 
 inline logger* application::get_logger()
diff --git a/src/behavior/ebt.cpp b/src/behavior/ebt.cpp
index 0232454..b800800 100644
--- a/src/behavior/ebt.cpp
+++ b/src/behavior/ebt.cpp
@@ -33,7 +33,7 @@ status print(context& context, const std::string& text)
 
 status print_eid(context& context)
 {
-	std::cout << context.entity << std::endl;
+	std::cout << static_cast<std::size_t>(context.entity) << std::endl;
 	return status::success;
 }
 
diff --git a/src/geometry/mesh-accelerator.hpp b/src/geometry/mesh-accelerator.hpp
index a142593..097683f 100644
--- a/src/geometry/mesh-accelerator.hpp
+++ b/src/geometry/mesh-accelerator.hpp
@@ -21,7 +21,7 @@
 #define ANTKEEPER_MESH_ACCELERATOR_HPP
 
 #include "mesh.hpp"
-#include "octree.hpp"
+#include "geometry/octree.hpp"
 #include "geometry/aabb.hpp"
 #include "intersection.hpp"
 #include <list>
diff --git a/src/main.cpp b/src/main.cpp
index be3482e..e8acd66 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -29,7 +29,7 @@ int main(int argc, char* argv[])
 	}
 	catch (const std::exception& e)
 	{
-		std::cerr << "Exception caught: \"" << e.what() << "\"" << std::endl;
+		std::cerr << "Unhandled exception: \"" << e.what() << "\"" << std::endl;
 	}
 
 	return EXIT_FAILURE;
diff --git a/src/systems/tool-system.cpp b/src/systems/tool-system.cpp
index 2d2bf74..b6709c8 100644
--- a/src/systems/tool-system.cpp
+++ b/src/systems/tool-system.cpp
@@ -54,6 +54,7 @@ void tool_system::update(double t, double dt)
 	bool intersection = false;
 	float3 pick;
 
+	// Cast ray from cursor to collision components to find closest intersection
 	registry.view<transform_component, collision_component>().each(
 		[&](auto entity, auto& transform, auto& collision)
 		{
@@ -69,6 +70,7 @@ void tool_system::update(double t, double dt)
 				return;
 			}
 
+			// Narrow phase mesh test
 			auto mesh_result = collision.mesh_accelerator.query_nearest(transformed_ray);
 			if (mesh_result)
 			{
@@ -79,20 +81,6 @@ void tool_system::update(double t, double dt)
 					pick = picking_ray.extrapolate(a);
 				}
 			}
-
-			/*
-			// Narrow phase mesh test
-			auto mesh_result = ray_mesh_intersection(transformed_ray, *collision.mesh);
-			if (std::get<0>(mesh_result))
-			{
-				intersection = true;
-				if (std::get<1>(mesh_result) < a)
-				{
-					a = std::get<1>(mesh_result);
-					pick = picking_ray.extrapolate(a);
-				}
-			}
-			*/
 		});
 	
 	const float3& camera_position = camera->get_translation();
@@ -110,7 +98,7 @@ void tool_system::update(double t, double dt)
 			pick_angle = -pick_angle;
 	}
 
-
+	// Move active tools to intersection location
 	registry.view<tool_component, transform_component>().each(
 		[&](auto entity, auto& tool, auto& transform)
 		{