diff --git a/.gitignore b/.gitignore
index 1c2ebad1..f11eaee6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,6 +57,8 @@ perf.data*
 binaries/*Debug
 binaries/*Release
 build/.vs
+build/*.VC.VC.opendb
+build/*.VC.db
 build/*.sdf
 build/*.suo
 build/*.opensdf
diff --git a/build/Lol (vs2015).sln b/build/Lol (vs2015).sln
index a994c4c4..1663e54c 100644
--- a/build/Lol (vs2015).sln	
+++ b/build/Lol (vs2015).sln	
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.22512.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deushax", "..\games\deushax\deushax.vcxproj", "{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}"
 EndProject
@@ -148,6 +148,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{B629
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Doc", "Doc", "{65FD48E9-C936-4A23-AD46-BF738B6D4733}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Zepto 8", "Zepto 8", "{66A8679B-1D16-4BFA-B725-FDE85750E366}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zepto8", "..\tools\zepto8\zepto8.vcxproj", "{28F5DE0F-B162-4833-8F61-A1AF782850A2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ORBIS = Debug|ORBIS
@@ -613,6 +617,18 @@ Global
 		{73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|Win32.Build.0 = Release|Win32
 		{73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|x64.ActiveCfg = Release|x64
 		{73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|x64.Build.0 = Release|x64
+		{28F5DE0F-B162-4833-8F61-A1AF782850A2}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
+		{28F5DE0F-B162-4833-8F61-A1AF782850A2}.Debug|ORBIS.Build.0 = Debug|ORBIS
+		{28F5DE0F-B162-4833-8F61-A1AF782850A2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{28F5DE0F-B162-4833-8F61-A1AF782850A2}.Debug|Win32.Build.0 = Debug|Win32
+		{28F5DE0F-B162-4833-8F61-A1AF782850A2}.Debug|x64.ActiveCfg = Debug|x64
+		{28F5DE0F-B162-4833-8F61-A1AF782850A2}.Debug|x64.Build.0 = Debug|x64
+		{28F5DE0F-B162-4833-8F61-A1AF782850A2}.Release|ORBIS.ActiveCfg = Release|ORBIS
+		{28F5DE0F-B162-4833-8F61-A1AF782850A2}.Release|ORBIS.Build.0 = Release|ORBIS
+		{28F5DE0F-B162-4833-8F61-A1AF782850A2}.Release|Win32.ActiveCfg = Release|Win32
+		{28F5DE0F-B162-4833-8F61-A1AF782850A2}.Release|Win32.Build.0 = Release|Win32
+		{28F5DE0F-B162-4833-8F61-A1AF782850A2}.Release|x64.ActiveCfg = Release|x64
+		{28F5DE0F-B162-4833-8F61-A1AF782850A2}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -683,5 +699,7 @@ Global
 		{4C4BD478-3767-4C27-BD91-DAAFE7CD03A2} = {3D341D8A-E400-4B1D-BC05-B5C35487D9B5}
 		{73F1A804-1116-46C3-922A-9C0ADEB33F52} = {4C4BD478-3767-4C27-BD91-DAAFE7CD03A2}
 		{B6297FF2-63D0-41EE-BE13-EFF720C9B0FA} = {65FD48E9-C936-4A23-AD46-BF738B6D4733}
+		{66A8679B-1D16-4BFA-B725-FDE85750E366} = {3D341D8A-E400-4B1D-BC05-B5C35487D9B5}
+		{28F5DE0F-B162-4833-8F61-A1AF782850A2} = {66A8679B-1D16-4BFA-B725-FDE85750E366}
 	EndGlobalSection
 EndGlobal
diff --git a/src/debug/fps.cpp b/src/debug/fps.cpp
index ef70393a..b9551246 100644
--- a/src/debug/fps.cpp
+++ b/src/debug/fps.cpp
@@ -88,8 +88,8 @@ void DebugFps::TickGame(float seconds)
             1e3f * Profiler::GetAvg(Profiler::STAT_TICK_BLIT),
             1e3f * Profiler::GetAvg(Profiler::STAT_TICK_FRAME),
             1.0f / Profiler::GetAvg(Profiler::STAT_TICK_FRAME),
-            1e3f * Profiler::GetAvg(Profiler::STAT_USER_00),
-           Ticker::GetFrameNum());
+            Ticker::GetFrameNum(),
+            1e3f * Profiler::GetAvg(Profiler::STAT_USER_00));
     data->lines[0]->SetText(buf);
 #endif
 }