diff --git a/class.lua b/class.lua
index 6255359..7d62707 100644
--- a/class.lua
+++ b/class.lua
@@ -56,7 +56,7 @@ end
 
 local function new(class)
 	-- mixins
-	class = class or {}
+	class = class or {}  -- class can be nil
 	local inc = class.__includes or {}
 	if getmetatable(inc) then inc = {inc} end
 
diff --git a/docs/gamestate.rst b/docs/gamestate.rst
index 75a0359..dfe60ec 100644
--- a/docs/gamestate.rst
+++ b/docs/gamestate.rst
@@ -59,7 +59,7 @@ callbacks for initalizing, entering and leaving a state:
     Called every time when entering the state. See :func:`Gamestate.switch`.
 
 ``leave()``
-    Called when leaving a state. See :func:`Gamestate.switch` and :func:`Gamestate.push`.
+    Called when leaving a state. See :func:`Gamestate.switch` and :func:`Gamestate.pop`.
 
 ``resume()``
     Called when re-entering a state by :func:`Gamestate.pop`-ing another state.