diff --git a/beamerthemeawesome.sty b/beamerthemeawesome.sty
index 6f742cf..4fece17 100644
--- a/beamerthemeawesome.sty
+++ b/beamerthemeawesome.sty
@@ -115,12 +115,10 @@
 			\stepcounter{framesinsubsection}%
 		\fi%
 	\fi%
-	\ifnum\theframesinsection=0\setcounter{framesinsection}{1}\fi%
-	\ifnum\theframesinsubsection=0\setcounter{framesinsubsection}{1}\fi%
 }
 
-\BeforeBeginEnvironment{frame}{\stepframe}
-\pretocmd\againframe{\stepframe}{}{}
+% \BeforeBeginEnvironment{frame}{\stepframe}
+% \pretocmd\againframe{\stepframe}{}{}
 
 \def\refreshcountsinaux{%
 	\immediate\write\@auxout{\global\noexpand\@namedef{s@totalsubsectionframes-\arabic{section}-\arabic{subsection}}{\theframesinsubsection}}%
@@ -479,6 +477,7 @@ segmentation style={lcr, solid, shorten >=1mm,shorten <=1mm, line width=\smile@l
 
 % Kinda hacky, but AtBeginEnvironment does not work with beamer tex.stackexchange.com/a/436338/286979
 \pretocmd\beamer@checkframetitle{%
+	\stepframe%
 	\transfade[duration=0.1]%
 	\ifbeamer@isfragile%
 		\label{page:\insertframenumber}%
@@ -491,7 +490,7 @@ segmentation style={lcr, solid, shorten >=1mm,shorten <=1mm, line width=\smile@l
 		\begin{wide}\centering%
 		\usebeamerfont{title}%
 		\usebeamercolor[fg]{section number projected}%
-		\scalebox{1.3}{ \raisebox{-1pt}{\insertsectionnumber}}.~%
+		% \scalebox{1.3}{ \raisebox{-1pt}{\insertsectionnumber}}.~%
 		\usebeamercolor[fg]{title}%
 		\insertsectionhead%
 		\end{wide}%
@@ -503,9 +502,9 @@ segmentation style={lcr, solid, shorten >=1mm,shorten <=1mm, line width=\smile@l
 		\begin{wide}\centering%
 		\usebeamerfont{title}%
 		\usebeamercolor[fg]{section number projected}%
-		\scalebox{1.3}{\raisebox{-1pt}{\insertsectionnumber}}.%
+		% \scalebox{1.3}{\raisebox{-1pt}{\insertsectionnumber}}.%
 		\usebeamercolor[fg]{subsection number projected}%
-		\textsubscript{\insertsubsectionnumber}~%
+		% \textsubscript{\insertsubsectionnumber}~%
 		\usebeamercolor[fg]{title}%
 		\insertsubsectionhead%
 		\end{wide}%
@@ -513,10 +512,13 @@ segmentation style={lcr, solid, shorten >=1mm,shorten <=1mm, line width=\smile@l
 \fi}
 
 \AtEndDocument{
+  \begingroup
+  \logo{}
 	{\setbeamercolor{background canvas}{bg=accent}
 	\begin{frame}[b,noframenumbering]\thispagestyle{navigation@titlepage}%
 		\begin{wide}\color{white}%
 			\Large\textbf{\insertauthor}\vskip0.5em\scriptsize\insertlocation,~\insertdate\hfill\insertemail%
 		\end{wide}%
 	\end{frame}}
+  \endgroup
 }