diff --git a/common/debugging/timer.cpp b/common/debugging/timer.cpp
index 29d107a..efcaf3b 100644
--- a/common/debugging/timer.cpp
+++ b/common/debugging/timer.cpp
@@ -39,7 +39,7 @@ void Timer::Stop() {
 
 std::ostream& operator<<(std::ostream& os, Timer& t) {
 	os << t.GetName() << ": ";
-	os << std::chrono::duration_cast<std::chrono::milliseconds>(t.GetTime()).count();
-	os << "ms";
+	os << std::chrono::duration_cast<std::chrono::microseconds>(t.GetTime()).count();
+	os << "us";
 	return os;
 }
diff --git a/common/debugging/timer.hpp b/common/debugging/timer.hpp
index dfafec9..ac66419 100644
--- a/common/debugging/timer.hpp
+++ b/common/debugging/timer.hpp
@@ -34,8 +34,8 @@ public:
 	Timer(std::string s);
 	~Timer() = default;
 
-	inline void Start();
-	inline void Stop();
+	void Start();
+	void Stop();
 
 	//accessors and mutators
 	Clock::duration GetTime() { return timeSpan; }