diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl
index 1d517e0..3311e11 100644
--- a/ATL/Pooh/items.atl
+++ b/ATL/Pooh/items.atl
@@ -119,7 +119,7 @@
 	a good idea to carry this around with you..."
 	command "study"
 
-define-item "Life"
+define-item "Card"
 	description "
 	...................................
 	...................................
@@ -129,8 +129,7 @@
 	...................................
 	...................................
 	"
-	fixed
-
+	
 define-item "Magic map"
 	description "This is a strange map. It always seems to be changing. One
 	moment it will show you one thing, the next something completely

diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl
index 1d517e0..3311e11 100644
--- a/ATL/Pooh/items.atl
+++ b/ATL/Pooh/items.atl
@@ -119,7 +119,7 @@
 	a good idea to carry this around with you..."
 	command "study"
 
-define-item "Life"
+define-item "Card"
 	description "
 	...................................
 	...................................
@@ -129,8 +129,7 @@
 	...................................
 	...................................
 	"
-	fixed
-
+	
 define-item "Magic map"
 	description "This is a strange map. It always seems to be changing. One
 	moment it will show you one thing, the next something completely
diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp
index c9e3365..2d7d259 100644
--- a/ATL/Pooh/pooh-extensions.lisp
+++ b/ATL/Pooh/pooh-extensions.lisp
@@ -9,6 +9,7 @@
 
 (defun eat (player &optional arg)
 	"Allow the player to eat something."
+	;; XXX If any other edibles are added, split this function up
 	(cond ((null arg) (format t "~&What do you want to eat?"))
 		;; Berries can be eaten any time, but don't have any effect
 		((and (equalp arg "berries")

diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl
index 1d517e0..3311e11 100644
--- a/ATL/Pooh/items.atl
+++ b/ATL/Pooh/items.atl
@@ -119,7 +119,7 @@
 	a good idea to carry this around with you..."
 	command "study"
 
-define-item "Life"
+define-item "Card"
 	description "
 	...................................
 	...................................
@@ -129,8 +129,7 @@
 	...................................
 	...................................
 	"
-	fixed
-
+	
 define-item "Magic map"
 	description "This is a strange map. It always seems to be changing. One
 	moment it will show you one thing, the next something completely
diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp
index c9e3365..2d7d259 100644
--- a/ATL/Pooh/pooh-extensions.lisp
+++ b/ATL/Pooh/pooh-extensions.lisp
@@ -9,6 +9,7 @@
 
 (defun eat (player &optional arg)
 	"Allow the player to eat something."
+	;; XXX If any other edibles are added, split this function up
 	(cond ((null arg) (format t "~&What do you want to eat?"))
 		;; Berries can be eaten any time, but don't have any effect
 		((and (equalp arg "berries")
diff --git a/ATL/Pooh/pooh.atl b/ATL/Pooh/pooh.atl
index 5e16ced..fce7dbb 100644
--- a/ATL/Pooh/pooh.atl
+++ b/ATL/Pooh/pooh.atl
@@ -6,7 +6,7 @@
 ; author: Daniel Vedder
 ; date: 07/06/2017
 
-name-world "100 Acre Wood"
+name-world "100 Acre Wood" ;TODO Remove this
 
 load-file "pooh-extensions.lisp"
 load-file "woodland-map.lisp"
@@ -22,7 +22,7 @@
 	strength 1
 	dexterity 4
 	constitution 4
-
+	
 define-player "Christopher Robin"
 	description "Christopher Robin is my game dev character."
 	place "Piglet's porch" ;Development

diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl
index 1d517e0..3311e11 100644
--- a/ATL/Pooh/items.atl
+++ b/ATL/Pooh/items.atl
@@ -119,7 +119,7 @@
 	a good idea to carry this around with you..."
 	command "study"
 
-define-item "Life"
+define-item "Card"
 	description "
 	...................................
 	...................................
@@ -129,8 +129,7 @@
 	...................................
 	...................................
 	"
-	fixed
-
+	
 define-item "Magic map"
 	description "This is a strange map. It always seems to be changing. One
 	moment it will show you one thing, the next something completely
diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp
index c9e3365..2d7d259 100644
--- a/ATL/Pooh/pooh-extensions.lisp
+++ b/ATL/Pooh/pooh-extensions.lisp
@@ -9,6 +9,7 @@
 
 (defun eat (player &optional arg)
 	"Allow the player to eat something."
+	;; XXX If any other edibles are added, split this function up
 	(cond ((null arg) (format t "~&What do you want to eat?"))
 		;; Berries can be eaten any time, but don't have any effect
 		((and (equalp arg "berries")
diff --git a/ATL/Pooh/pooh.atl b/ATL/Pooh/pooh.atl
index 5e16ced..fce7dbb 100644
--- a/ATL/Pooh/pooh.atl
+++ b/ATL/Pooh/pooh.atl
@@ -6,7 +6,7 @@
 ; author: Daniel Vedder
 ; date: 07/06/2017
 
-name-world "100 Acre Wood"
+name-world "100 Acre Wood" ;TODO Remove this
 
 load-file "pooh-extensions.lisp"
 load-file "woodland-map.lisp"
@@ -22,7 +22,7 @@
 	strength 1
 	dexterity 4
 	constitution 4
-
+	
 define-player "Christopher Robin"
 	description "Christopher Robin is my game dev character."
 	place "Piglet's porch" ;Development
diff --git a/ATL/Pooh/woods.atl b/ATL/Pooh/woods.atl
index a8d5840..d965b4f 100644
--- a/ATL/Pooh/woods.atl
+++ b/ATL/Pooh/woods.atl
@@ -15,7 +15,6 @@
 	item "Hunny"
 	item "Jar"
 	item "Map"
-	hidden "Lamp" ;XXX development
 
 define-place "Pooh's porch"
 	description "You are standing in front of your very own home - Pooh's home.
@@ -86,7 +85,7 @@
 	description "You can feel the ground becoming soft underneath your feet as
 	you approach the marshes and bogs to the south of the
 	100 Acre wood. Plenty of moss grows around the roots of
-	the trees. Here and there, are willow bends its branches."
+	the trees. Here and there a willow bends its branches."
 	item "Stick"
 	neighbour "Central woods"
 	neighbour "Eastern woods"
@@ -155,6 +154,7 @@
 	the sky."
 	neighbour "Hill"
 	npc "Christopher Robin"
+	item "Card"
 	requires "Magic map"
 
 define-place "Bridge"
@@ -315,13 +315,3 @@
 	neighbour "Sandy pit"
 	neighbour "Rapids"
 	exit-hook "misty-forest"
-
-define-place "The World"
-	description "Well, so you have dared it at last. With the 100 Acre Wood at
-	your back, you face the Great Unknown. Many adventures lie behind
-	you, but the greatest one is still to come. Will you brave it?
-
-	It is called: Life."
-	requires "Maturity"
-	neighbour "Bridge"
-	item "Life"
\ No newline at end of file

diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl
index 1d517e0..3311e11 100644
--- a/ATL/Pooh/items.atl
+++ b/ATL/Pooh/items.atl
@@ -119,7 +119,7 @@
 	a good idea to carry this around with you..."
 	command "study"
 
-define-item "Life"
+define-item "Card"
 	description "
 	...................................
 	...................................
@@ -129,8 +129,7 @@
 	...................................
 	...................................
 	"
-	fixed
-
+	
 define-item "Magic map"
 	description "This is a strange map. It always seems to be changing. One
 	moment it will show you one thing, the next something completely
diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp
index c9e3365..2d7d259 100644
--- a/ATL/Pooh/pooh-extensions.lisp
+++ b/ATL/Pooh/pooh-extensions.lisp
@@ -9,6 +9,7 @@
 
 (defun eat (player &optional arg)
 	"Allow the player to eat something."
+	;; XXX If any other edibles are added, split this function up
 	(cond ((null arg) (format t "~&What do you want to eat?"))
 		;; Berries can be eaten any time, but don't have any effect
 		((and (equalp arg "berries")
diff --git a/ATL/Pooh/pooh.atl b/ATL/Pooh/pooh.atl
index 5e16ced..fce7dbb 100644
--- a/ATL/Pooh/pooh.atl
+++ b/ATL/Pooh/pooh.atl
@@ -6,7 +6,7 @@
 ; author: Daniel Vedder
 ; date: 07/06/2017
 
-name-world "100 Acre Wood"
+name-world "100 Acre Wood" ;TODO Remove this
 
 load-file "pooh-extensions.lisp"
 load-file "woodland-map.lisp"
@@ -22,7 +22,7 @@
 	strength 1
 	dexterity 4
 	constitution 4
-
+	
 define-player "Christopher Robin"
 	description "Christopher Robin is my game dev character."
 	place "Piglet's porch" ;Development
diff --git a/ATL/Pooh/woods.atl b/ATL/Pooh/woods.atl
index a8d5840..d965b4f 100644
--- a/ATL/Pooh/woods.atl
+++ b/ATL/Pooh/woods.atl
@@ -15,7 +15,6 @@
 	item "Hunny"
 	item "Jar"
 	item "Map"
-	hidden "Lamp" ;XXX development
 
 define-place "Pooh's porch"
 	description "You are standing in front of your very own home - Pooh's home.
@@ -86,7 +85,7 @@
 	description "You can feel the ground becoming soft underneath your feet as
 	you approach the marshes and bogs to the south of the
 	100 Acre wood. Plenty of moss grows around the roots of
-	the trees. Here and there, are willow bends its branches."
+	the trees. Here and there a willow bends its branches."
 	item "Stick"
 	neighbour "Central woods"
 	neighbour "Eastern woods"
@@ -155,6 +154,7 @@
 	the sky."
 	neighbour "Hill"
 	npc "Christopher Robin"
+	item "Card"
 	requires "Magic map"
 
 define-place "Bridge"
@@ -315,13 +315,3 @@
 	neighbour "Sandy pit"
 	neighbour "Rapids"
 	exit-hook "misty-forest"
-
-define-place "The World"
-	description "Well, so you have dared it at last. With the 100 Acre Wood at
-	your back, you face the Great Unknown. Many adventures lie behind
-	you, but the greatest one is still to come. Will you brave it?
-
-	It is called: Life."
-	requires "Maturity"
-	neighbour "Bridge"
-	item "Life"
\ No newline at end of file
diff --git a/doc/HACKING b/doc/HACKING
index e69de29..fef0ff7 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -0,0 +1,186 @@
+==========================
+|| PROGRAMMING ATLANTIS ||
+==========================
+
+So you want to create your own game worlds? Great! Here's what you need to know:
+
+The Atlantis framework itself is written in Common Lisp, a programming language
+with a long history that is nonetheless considered somewhat arcane by many
+programmers today. Fortunately, you do not need to know it in order to create a
+basic game (though it does help if you want to do more advanced stuff).
+
+The majority of coding for a game is done in a custom language called ATL. This
+is a simple descriptive language that should be very easy to pick up, especially
+if you have some previous programming experience. Looking at some of the
+existing game files (e.g. in the folder ATL/Pooh) will already give you a feel
+for the language. The full reference is found below.
+
+This guide is intended to get you started. It is not intended to be a full and
+exhaustive reference to the framework - you are still going to have to do some
+work on your own. But it should see you on your way to creating your very own
+game world. (And if you have questions, don't hesitate to contact me.)
+
+
+ATL SYNTAX
+
+ATL	is line-oriented, with each line being of the form '<keyword> <value>'.
+There must be whitespace between the keyword and the value, and string values
+must be enclosed by double quotes. (A "string" in programming jargon is a series
+of alphanumeric characters, what you might call a "text".) Strings spanning
+multiple lines are concatenated, with leading and trailing whitespace being
+trimmed. Comments begin with a semi-colon and continue to the end of the line.
+
+Most ATL code consists of define blocks. These describe one entity of the game,
+such as a player, an item or a room (for the full list, see below). A define
+block consists of a define command and one to several option commands. It is
+structured as follows:
+
+define-<object> "<object name>"
+	<option 1> <value 1>
+	<option n> <value n>
+
+Note that option commands must be indented. The block is terminated by an empty
+line. If the value of a given option is ommitted, it is set to T (the Common
+Lisp boolean "true" value). Some options can be passed several times, in which
+case each successive value is added to a list that forms the final value. (For
+example, a room can have many neighbours.)
+
+The special command "load-file" takes a string argument and will load the
+specified file. By default, the file will be treated as another ATL file and
+parsed accordingly. However, if the file name ends with ".lisp", it will be
+interpreted as a Lisp extension file. This is a powerful feature, as code loaded
+in this manner has access to the complete Atlantis engine. One can thus expand
+the framework to include custom commands or add special effects to certain game
+objects. More on this below.
+
+
+GAME OBJECTS
+
+The following is a list of all game object types (as given by their define
+commands) with the accompanying options and their default values. NIL denotes
+the empty list - these options may be passed several times (see above).
+
+(TODO - Describe options)
+
+define-player <name>
+	description ""
+	strength 0
+	dexterity 0
+	constitution 0
+	intelligence 0
+	money 0
+	max-health 50
+	health 50
+	item NIL
+	weapon ""
+	armour-class 0
+	place ""
+
+define-place <name>
+	description ""
+	neighbour NIL
+	item NIL
+	hidden NIL
+	monster NIL
+	npc NIL
+	command NIL
+	requires ""
+	entry-hook ""
+	exit-hook ""
+
+define-npc <name>
+	description ""
+	says NIL
+	sells NIL
+	buys NIL
+	quest ""
+	interaction-hook ""
+
+define-monster <name>
+	description ""
+	health 0
+	strength 0
+	dexterity 0
+	aggression 0
+	spawn 0
+	item NIL
+	weapon ""
+	armour-class 0
+	attack-hook ""
+	death-msg ""
+
+define-item <name>
+	description ""
+	cost 0
+	weapon FALSE
+	fixed FALSE
+	infinite FALSE
+	pickup-hook ""
+	drop-hook ""
+	command NIL
+
+define-weapon <name>
+	description ""
+	type ""
+	damage 0
+
+define-quest <name>
+	name ""
+	say-before ""
+	say-after ""
+	proof-item NIL
+	reward-item NIL
+	money 0
+	experience 0
+	infinite FALSE
+
+
+LISP EXPANSIONS
+
+If you are feeling adventurous and know a little Lisp, feel free to write a Lisp
+extension file and integrate it in your game. (You will find an example at
+ATL/Pooh/pooh-extensions.lisp.)
+
+The functions you write here may be used as hooks, or as extra commands for
+places and items. For this purpose, each function must take at least one
+argument, an instance of the current player object. Command functions must also
+take an optional string argument for any parameters found in the player input.
+
+As stated above, Lisp code loaded into the game has access to the full Atlantis
+framework and can call any function. This means that you can, in theory, modify
+anything you like. However, as the code architecture is somewhat complex and is
+subject to frequent, I will not give a full documentation here - if you need to
+know something, look at the examples and read the code ;-)
+
+However, I will provide a brief overview over the different modules and the most
+important functions contained therein. The following files are all to be found
+in the 'lisp' folder.
+
+atlantis.lisp - This is the main game module. It codes for the start menu. The
+			  only thing that concerns us here is the variable *games*, which is
+			  an association list of game names and their respective main ATL
+			  file. All new games must be registered here.
+
+creator.lisp - Not of interest to us.
+
+game-objects.lisp - Defines game object types. Most useful functions:
+				  set-object-attribute and remove-object-attribute, which deal
+				  with the nitty-gritty of manipulating all the different
+				  types.
+
+interpreter.lisp - Do not touch!
+
+player.lisp - Deals with the player object. Most useful functions:
+			change-player-health, add-player-experience and add-player-money
+
+ui.lisp - Defines the in-game commands. Not interesting except as an example for
+		how to implement command functions.
+
+util.lisp - Lots of useful utility functions. Browse at leisure.
+
+world.lisp - Administers the game world instance. Most useful function:
+		   get-game-object, a type-agnostic getter function.
+
+
+Daniel Vedder
+Last modified 10/10/2017

diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl
index 1d517e0..3311e11 100644
--- a/ATL/Pooh/items.atl
+++ b/ATL/Pooh/items.atl
@@ -119,7 +119,7 @@
 	a good idea to carry this around with you..."
 	command "study"
 
-define-item "Life"
+define-item "Card"
 	description "
 	...................................
 	...................................
@@ -129,8 +129,7 @@
 	...................................
 	...................................
 	"
-	fixed
-
+	
 define-item "Magic map"
 	description "This is a strange map. It always seems to be changing. One
 	moment it will show you one thing, the next something completely
diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp
index c9e3365..2d7d259 100644
--- a/ATL/Pooh/pooh-extensions.lisp
+++ b/ATL/Pooh/pooh-extensions.lisp
@@ -9,6 +9,7 @@
 
 (defun eat (player &optional arg)
 	"Allow the player to eat something."
+	;; XXX If any other edibles are added, split this function up
 	(cond ((null arg) (format t "~&What do you want to eat?"))
 		;; Berries can be eaten any time, but don't have any effect
 		((and (equalp arg "berries")
diff --git a/ATL/Pooh/pooh.atl b/ATL/Pooh/pooh.atl
index 5e16ced..fce7dbb 100644
--- a/ATL/Pooh/pooh.atl
+++ b/ATL/Pooh/pooh.atl
@@ -6,7 +6,7 @@
 ; author: Daniel Vedder
 ; date: 07/06/2017
 
-name-world "100 Acre Wood"
+name-world "100 Acre Wood" ;TODO Remove this
 
 load-file "pooh-extensions.lisp"
 load-file "woodland-map.lisp"
@@ -22,7 +22,7 @@
 	strength 1
 	dexterity 4
 	constitution 4
-
+	
 define-player "Christopher Robin"
 	description "Christopher Robin is my game dev character."
 	place "Piglet's porch" ;Development
diff --git a/ATL/Pooh/woods.atl b/ATL/Pooh/woods.atl
index a8d5840..d965b4f 100644
--- a/ATL/Pooh/woods.atl
+++ b/ATL/Pooh/woods.atl
@@ -15,7 +15,6 @@
 	item "Hunny"
 	item "Jar"
 	item "Map"
-	hidden "Lamp" ;XXX development
 
 define-place "Pooh's porch"
 	description "You are standing in front of your very own home - Pooh's home.
@@ -86,7 +85,7 @@
 	description "You can feel the ground becoming soft underneath your feet as
 	you approach the marshes and bogs to the south of the
 	100 Acre wood. Plenty of moss grows around the roots of
-	the trees. Here and there, are willow bends its branches."
+	the trees. Here and there a willow bends its branches."
 	item "Stick"
 	neighbour "Central woods"
 	neighbour "Eastern woods"
@@ -155,6 +154,7 @@
 	the sky."
 	neighbour "Hill"
 	npc "Christopher Robin"
+	item "Card"
 	requires "Magic map"
 
 define-place "Bridge"
@@ -315,13 +315,3 @@
 	neighbour "Sandy pit"
 	neighbour "Rapids"
 	exit-hook "misty-forest"
-
-define-place "The World"
-	description "Well, so you have dared it at last. With the 100 Acre Wood at
-	your back, you face the Great Unknown. Many adventures lie behind
-	you, but the greatest one is still to come. Will you brave it?
-
-	It is called: Life."
-	requires "Maturity"
-	neighbour "Bridge"
-	item "Life"
\ No newline at end of file
diff --git a/doc/HACKING b/doc/HACKING
index e69de29..fef0ff7 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -0,0 +1,186 @@
+==========================
+|| PROGRAMMING ATLANTIS ||
+==========================
+
+So you want to create your own game worlds? Great! Here's what you need to know:
+
+The Atlantis framework itself is written in Common Lisp, a programming language
+with a long history that is nonetheless considered somewhat arcane by many
+programmers today. Fortunately, you do not need to know it in order to create a
+basic game (though it does help if you want to do more advanced stuff).
+
+The majority of coding for a game is done in a custom language called ATL. This
+is a simple descriptive language that should be very easy to pick up, especially
+if you have some previous programming experience. Looking at some of the
+existing game files (e.g. in the folder ATL/Pooh) will already give you a feel
+for the language. The full reference is found below.
+
+This guide is intended to get you started. It is not intended to be a full and
+exhaustive reference to the framework - you are still going to have to do some
+work on your own. But it should see you on your way to creating your very own
+game world. (And if you have questions, don't hesitate to contact me.)
+
+
+ATL SYNTAX
+
+ATL	is line-oriented, with each line being of the form '<keyword> <value>'.
+There must be whitespace between the keyword and the value, and string values
+must be enclosed by double quotes. (A "string" in programming jargon is a series
+of alphanumeric characters, what you might call a "text".) Strings spanning
+multiple lines are concatenated, with leading and trailing whitespace being
+trimmed. Comments begin with a semi-colon and continue to the end of the line.
+
+Most ATL code consists of define blocks. These describe one entity of the game,
+such as a player, an item or a room (for the full list, see below). A define
+block consists of a define command and one to several option commands. It is
+structured as follows:
+
+define-<object> "<object name>"
+	<option 1> <value 1>
+	<option n> <value n>
+
+Note that option commands must be indented. The block is terminated by an empty
+line. If the value of a given option is ommitted, it is set to T (the Common
+Lisp boolean "true" value). Some options can be passed several times, in which
+case each successive value is added to a list that forms the final value. (For
+example, a room can have many neighbours.)
+
+The special command "load-file" takes a string argument and will load the
+specified file. By default, the file will be treated as another ATL file and
+parsed accordingly. However, if the file name ends with ".lisp", it will be
+interpreted as a Lisp extension file. This is a powerful feature, as code loaded
+in this manner has access to the complete Atlantis engine. One can thus expand
+the framework to include custom commands or add special effects to certain game
+objects. More on this below.
+
+
+GAME OBJECTS
+
+The following is a list of all game object types (as given by their define
+commands) with the accompanying options and their default values. NIL denotes
+the empty list - these options may be passed several times (see above).
+
+(TODO - Describe options)
+
+define-player <name>
+	description ""
+	strength 0
+	dexterity 0
+	constitution 0
+	intelligence 0
+	money 0
+	max-health 50
+	health 50
+	item NIL
+	weapon ""
+	armour-class 0
+	place ""
+
+define-place <name>
+	description ""
+	neighbour NIL
+	item NIL
+	hidden NIL
+	monster NIL
+	npc NIL
+	command NIL
+	requires ""
+	entry-hook ""
+	exit-hook ""
+
+define-npc <name>
+	description ""
+	says NIL
+	sells NIL
+	buys NIL
+	quest ""
+	interaction-hook ""
+
+define-monster <name>
+	description ""
+	health 0
+	strength 0
+	dexterity 0
+	aggression 0
+	spawn 0
+	item NIL
+	weapon ""
+	armour-class 0
+	attack-hook ""
+	death-msg ""
+
+define-item <name>
+	description ""
+	cost 0
+	weapon FALSE
+	fixed FALSE
+	infinite FALSE
+	pickup-hook ""
+	drop-hook ""
+	command NIL
+
+define-weapon <name>
+	description ""
+	type ""
+	damage 0
+
+define-quest <name>
+	name ""
+	say-before ""
+	say-after ""
+	proof-item NIL
+	reward-item NIL
+	money 0
+	experience 0
+	infinite FALSE
+
+
+LISP EXPANSIONS
+
+If you are feeling adventurous and know a little Lisp, feel free to write a Lisp
+extension file and integrate it in your game. (You will find an example at
+ATL/Pooh/pooh-extensions.lisp.)
+
+The functions you write here may be used as hooks, or as extra commands for
+places and items. For this purpose, each function must take at least one
+argument, an instance of the current player object. Command functions must also
+take an optional string argument for any parameters found in the player input.
+
+As stated above, Lisp code loaded into the game has access to the full Atlantis
+framework and can call any function. This means that you can, in theory, modify
+anything you like. However, as the code architecture is somewhat complex and is
+subject to frequent, I will not give a full documentation here - if you need to
+know something, look at the examples and read the code ;-)
+
+However, I will provide a brief overview over the different modules and the most
+important functions contained therein. The following files are all to be found
+in the 'lisp' folder.
+
+atlantis.lisp - This is the main game module. It codes for the start menu. The
+			  only thing that concerns us here is the variable *games*, which is
+			  an association list of game names and their respective main ATL
+			  file. All new games must be registered here.
+
+creator.lisp - Not of interest to us.
+
+game-objects.lisp - Defines game object types. Most useful functions:
+				  set-object-attribute and remove-object-attribute, which deal
+				  with the nitty-gritty of manipulating all the different
+				  types.
+
+interpreter.lisp - Do not touch!
+
+player.lisp - Deals with the player object. Most useful functions:
+			change-player-health, add-player-experience and add-player-money
+
+ui.lisp - Defines the in-game commands. Not interesting except as an example for
+		how to implement command functions.
+
+util.lisp - Lots of useful utility functions. Browse at leisure.
+
+world.lisp - Administers the game world instance. Most useful function:
+		   get-game-object, a type-agnostic getter function.
+
+
+Daniel Vedder
+Last modified 10/10/2017
diff --git a/doc/PLAYING b/doc/PLAYING
index 80b4cca..3ea7958 100644
--- a/doc/PLAYING
+++ b/doc/PLAYING
@@ -25,8 +25,8 @@
 
 The first option, "Start a new game", drops you into a submenu in which you can
 choose which game world you want to play. As of Atlantis 0.3, only the "Winnie
-the Pooh" world is fully functional. (You can try the others, but you won't get
-very far.)
+the Pooh" world is fully functional. (You can try the others, but they are far
+from complete.)
 
 The second option, "Load a game", is for returning users who have previously
 saved their game progress in one of the worlds. Again, you will be presented
@@ -59,6 +59,14 @@
 So if you get an error message telling you that a command is not available, make
 sure that you spelt it correctly.
 
+However, having said that, Atlantis will try to guess the correct command from
+an abbreviated input. The rules for this are pretty complex, but as long as your
+input is unambiguous, Atlantis ought to be able to figure out what you meant.
+(Example: Say you are in a room with an NPC called "young child". Then the
+command "l child" will be expanded to "look young child". However, if there is
+also a "crying child" in the room, "l child" is no longer unambiguous and will
+now return an error.)
+
 
 THE GAME SCREEN
 
@@ -69,7 +77,7 @@
 
 Underneath the place description are various lists, starting with neighbouring
 places. There may also be items, NPCs (= non-playing characters) or even
-monsters that you can interact with.
+monsters, all of which you can interact with.
 
 
 CORE COMMANDS
@@ -135,4 +143,4 @@
 
 
 Daniel Vedder
-Last modified 10/08/2017
+Last modified 10/10/2017

diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl
index 1d517e0..3311e11 100644
--- a/ATL/Pooh/items.atl
+++ b/ATL/Pooh/items.atl
@@ -119,7 +119,7 @@
 	a good idea to carry this around with you..."
 	command "study"
 
-define-item "Life"
+define-item "Card"
 	description "
 	...................................
 	...................................
@@ -129,8 +129,7 @@
 	...................................
 	...................................
 	"
-	fixed
-
+	
 define-item "Magic map"
 	description "This is a strange map. It always seems to be changing. One
 	moment it will show you one thing, the next something completely
diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp
index c9e3365..2d7d259 100644
--- a/ATL/Pooh/pooh-extensions.lisp
+++ b/ATL/Pooh/pooh-extensions.lisp
@@ -9,6 +9,7 @@
 
 (defun eat (player &optional arg)
 	"Allow the player to eat something."
+	;; XXX If any other edibles are added, split this function up
 	(cond ((null arg) (format t "~&What do you want to eat?"))
 		;; Berries can be eaten any time, but don't have any effect
 		((and (equalp arg "berries")
diff --git a/ATL/Pooh/pooh.atl b/ATL/Pooh/pooh.atl
index 5e16ced..fce7dbb 100644
--- a/ATL/Pooh/pooh.atl
+++ b/ATL/Pooh/pooh.atl
@@ -6,7 +6,7 @@
 ; author: Daniel Vedder
 ; date: 07/06/2017
 
-name-world "100 Acre Wood"
+name-world "100 Acre Wood" ;TODO Remove this
 
 load-file "pooh-extensions.lisp"
 load-file "woodland-map.lisp"
@@ -22,7 +22,7 @@
 	strength 1
 	dexterity 4
 	constitution 4
-
+	
 define-player "Christopher Robin"
 	description "Christopher Robin is my game dev character."
 	place "Piglet's porch" ;Development
diff --git a/ATL/Pooh/woods.atl b/ATL/Pooh/woods.atl
index a8d5840..d965b4f 100644
--- a/ATL/Pooh/woods.atl
+++ b/ATL/Pooh/woods.atl
@@ -15,7 +15,6 @@
 	item "Hunny"
 	item "Jar"
 	item "Map"
-	hidden "Lamp" ;XXX development
 
 define-place "Pooh's porch"
 	description "You are standing in front of your very own home - Pooh's home.
@@ -86,7 +85,7 @@
 	description "You can feel the ground becoming soft underneath your feet as
 	you approach the marshes and bogs to the south of the
 	100 Acre wood. Plenty of moss grows around the roots of
-	the trees. Here and there, are willow bends its branches."
+	the trees. Here and there a willow bends its branches."
 	item "Stick"
 	neighbour "Central woods"
 	neighbour "Eastern woods"
@@ -155,6 +154,7 @@
 	the sky."
 	neighbour "Hill"
 	npc "Christopher Robin"
+	item "Card"
 	requires "Magic map"
 
 define-place "Bridge"
@@ -315,13 +315,3 @@
 	neighbour "Sandy pit"
 	neighbour "Rapids"
 	exit-hook "misty-forest"
-
-define-place "The World"
-	description "Well, so you have dared it at last. With the 100 Acre Wood at
-	your back, you face the Great Unknown. Many adventures lie behind
-	you, but the greatest one is still to come. Will you brave it?
-
-	It is called: Life."
-	requires "Maturity"
-	neighbour "Bridge"
-	item "Life"
\ No newline at end of file
diff --git a/doc/HACKING b/doc/HACKING
index e69de29..fef0ff7 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -0,0 +1,186 @@
+==========================
+|| PROGRAMMING ATLANTIS ||
+==========================
+
+So you want to create your own game worlds? Great! Here's what you need to know:
+
+The Atlantis framework itself is written in Common Lisp, a programming language
+with a long history that is nonetheless considered somewhat arcane by many
+programmers today. Fortunately, you do not need to know it in order to create a
+basic game (though it does help if you want to do more advanced stuff).
+
+The majority of coding for a game is done in a custom language called ATL. This
+is a simple descriptive language that should be very easy to pick up, especially
+if you have some previous programming experience. Looking at some of the
+existing game files (e.g. in the folder ATL/Pooh) will already give you a feel
+for the language. The full reference is found below.
+
+This guide is intended to get you started. It is not intended to be a full and
+exhaustive reference to the framework - you are still going to have to do some
+work on your own. But it should see you on your way to creating your very own
+game world. (And if you have questions, don't hesitate to contact me.)
+
+
+ATL SYNTAX
+
+ATL	is line-oriented, with each line being of the form '<keyword> <value>'.
+There must be whitespace between the keyword and the value, and string values
+must be enclosed by double quotes. (A "string" in programming jargon is a series
+of alphanumeric characters, what you might call a "text".) Strings spanning
+multiple lines are concatenated, with leading and trailing whitespace being
+trimmed. Comments begin with a semi-colon and continue to the end of the line.
+
+Most ATL code consists of define blocks. These describe one entity of the game,
+such as a player, an item or a room (for the full list, see below). A define
+block consists of a define command and one to several option commands. It is
+structured as follows:
+
+define-<object> "<object name>"
+	<option 1> <value 1>
+	<option n> <value n>
+
+Note that option commands must be indented. The block is terminated by an empty
+line. If the value of a given option is ommitted, it is set to T (the Common
+Lisp boolean "true" value). Some options can be passed several times, in which
+case each successive value is added to a list that forms the final value. (For
+example, a room can have many neighbours.)
+
+The special command "load-file" takes a string argument and will load the
+specified file. By default, the file will be treated as another ATL file and
+parsed accordingly. However, if the file name ends with ".lisp", it will be
+interpreted as a Lisp extension file. This is a powerful feature, as code loaded
+in this manner has access to the complete Atlantis engine. One can thus expand
+the framework to include custom commands or add special effects to certain game
+objects. More on this below.
+
+
+GAME OBJECTS
+
+The following is a list of all game object types (as given by their define
+commands) with the accompanying options and their default values. NIL denotes
+the empty list - these options may be passed several times (see above).
+
+(TODO - Describe options)
+
+define-player <name>
+	description ""
+	strength 0
+	dexterity 0
+	constitution 0
+	intelligence 0
+	money 0
+	max-health 50
+	health 50
+	item NIL
+	weapon ""
+	armour-class 0
+	place ""
+
+define-place <name>
+	description ""
+	neighbour NIL
+	item NIL
+	hidden NIL
+	monster NIL
+	npc NIL
+	command NIL
+	requires ""
+	entry-hook ""
+	exit-hook ""
+
+define-npc <name>
+	description ""
+	says NIL
+	sells NIL
+	buys NIL
+	quest ""
+	interaction-hook ""
+
+define-monster <name>
+	description ""
+	health 0
+	strength 0
+	dexterity 0
+	aggression 0
+	spawn 0
+	item NIL
+	weapon ""
+	armour-class 0
+	attack-hook ""
+	death-msg ""
+
+define-item <name>
+	description ""
+	cost 0
+	weapon FALSE
+	fixed FALSE
+	infinite FALSE
+	pickup-hook ""
+	drop-hook ""
+	command NIL
+
+define-weapon <name>
+	description ""
+	type ""
+	damage 0
+
+define-quest <name>
+	name ""
+	say-before ""
+	say-after ""
+	proof-item NIL
+	reward-item NIL
+	money 0
+	experience 0
+	infinite FALSE
+
+
+LISP EXPANSIONS
+
+If you are feeling adventurous and know a little Lisp, feel free to write a Lisp
+extension file and integrate it in your game. (You will find an example at
+ATL/Pooh/pooh-extensions.lisp.)
+
+The functions you write here may be used as hooks, or as extra commands for
+places and items. For this purpose, each function must take at least one
+argument, an instance of the current player object. Command functions must also
+take an optional string argument for any parameters found in the player input.
+
+As stated above, Lisp code loaded into the game has access to the full Atlantis
+framework and can call any function. This means that you can, in theory, modify
+anything you like. However, as the code architecture is somewhat complex and is
+subject to frequent, I will not give a full documentation here - if you need to
+know something, look at the examples and read the code ;-)
+
+However, I will provide a brief overview over the different modules and the most
+important functions contained therein. The following files are all to be found
+in the 'lisp' folder.
+
+atlantis.lisp - This is the main game module. It codes for the start menu. The
+			  only thing that concerns us here is the variable *games*, which is
+			  an association list of game names and their respective main ATL
+			  file. All new games must be registered here.
+
+creator.lisp - Not of interest to us.
+
+game-objects.lisp - Defines game object types. Most useful functions:
+				  set-object-attribute and remove-object-attribute, which deal
+				  with the nitty-gritty of manipulating all the different
+				  types.
+
+interpreter.lisp - Do not touch!
+
+player.lisp - Deals with the player object. Most useful functions:
+			change-player-health, add-player-experience and add-player-money
+
+ui.lisp - Defines the in-game commands. Not interesting except as an example for
+		how to implement command functions.
+
+util.lisp - Lots of useful utility functions. Browse at leisure.
+
+world.lisp - Administers the game world instance. Most useful function:
+		   get-game-object, a type-agnostic getter function.
+
+
+Daniel Vedder
+Last modified 10/10/2017
diff --git a/doc/PLAYING b/doc/PLAYING
index 80b4cca..3ea7958 100644
--- a/doc/PLAYING
+++ b/doc/PLAYING
@@ -25,8 +25,8 @@
 
 The first option, "Start a new game", drops you into a submenu in which you can
 choose which game world you want to play. As of Atlantis 0.3, only the "Winnie
-the Pooh" world is fully functional. (You can try the others, but you won't get
-very far.)
+the Pooh" world is fully functional. (You can try the others, but they are far
+from complete.)
 
 The second option, "Load a game", is for returning users who have previously
 saved their game progress in one of the worlds. Again, you will be presented
@@ -59,6 +59,14 @@
 So if you get an error message telling you that a command is not available, make
 sure that you spelt it correctly.
 
+However, having said that, Atlantis will try to guess the correct command from
+an abbreviated input. The rules for this are pretty complex, but as long as your
+input is unambiguous, Atlantis ought to be able to figure out what you meant.
+(Example: Say you are in a room with an NPC called "young child". Then the
+command "l child" will be expanded to "look young child". However, if there is
+also a "crying child" in the room, "l child" is no longer unambiguous and will
+now return an error.)
+
 
 THE GAME SCREEN
 
@@ -69,7 +77,7 @@
 
 Underneath the place description are various lists, starting with neighbouring
 places. There may also be items, NPCs (= non-playing characters) or even
-monsters that you can interact with.
+monsters, all of which you can interact with.
 
 
 CORE COMMANDS
@@ -135,4 +143,4 @@
 
 
 Daniel Vedder
-Last modified 10/08/2017
+Last modified 10/10/2017
diff --git a/doc/TODO b/doc/TODO
index ef5aba7..4b9efb4 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,17 +1,14 @@
 ATLANTIS TODO
 
 LISP
-* prevent illegal input characters from causing a crash
-* test all commands again after fuzzy-matching was added
+* prevent illegal input characters from causing a crash -> PRIORITY
 * split ui.lisp into two modules (one for interaction functions)
 	
 ATL	
 * fill in missing place descriptions
 * hide 2 more pots of honey
-* require XP minimum to finish game?
 * think of more quests
 * integrate the quests to lead the player through the game
-* remove "The World" again, games should finish at Galleon's lap
 
 
 NOTES

diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl
index 1d517e0..3311e11 100644
--- a/ATL/Pooh/items.atl
+++ b/ATL/Pooh/items.atl
@@ -119,7 +119,7 @@
 	a good idea to carry this around with you..."
 	command "study"
 
-define-item "Life"
+define-item "Card"
 	description "
 	...................................
 	...................................
@@ -129,8 +129,7 @@
 	...................................
 	...................................
 	"
-	fixed
-
+	
 define-item "Magic map"
 	description "This is a strange map. It always seems to be changing. One
 	moment it will show you one thing, the next something completely
diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp
index c9e3365..2d7d259 100644
--- a/ATL/Pooh/pooh-extensions.lisp
+++ b/ATL/Pooh/pooh-extensions.lisp
@@ -9,6 +9,7 @@
 
 (defun eat (player &optional arg)
 	"Allow the player to eat something."
+	;; XXX If any other edibles are added, split this function up
 	(cond ((null arg) (format t "~&What do you want to eat?"))
 		;; Berries can be eaten any time, but don't have any effect
 		((and (equalp arg "berries")
diff --git a/ATL/Pooh/pooh.atl b/ATL/Pooh/pooh.atl
index 5e16ced..fce7dbb 100644
--- a/ATL/Pooh/pooh.atl
+++ b/ATL/Pooh/pooh.atl
@@ -6,7 +6,7 @@
 ; author: Daniel Vedder
 ; date: 07/06/2017
 
-name-world "100 Acre Wood"
+name-world "100 Acre Wood" ;TODO Remove this
 
 load-file "pooh-extensions.lisp"
 load-file "woodland-map.lisp"
@@ -22,7 +22,7 @@
 	strength 1
 	dexterity 4
 	constitution 4
-
+	
 define-player "Christopher Robin"
 	description "Christopher Robin is my game dev character."
 	place "Piglet's porch" ;Development
diff --git a/ATL/Pooh/woods.atl b/ATL/Pooh/woods.atl
index a8d5840..d965b4f 100644
--- a/ATL/Pooh/woods.atl
+++ b/ATL/Pooh/woods.atl
@@ -15,7 +15,6 @@
 	item "Hunny"
 	item "Jar"
 	item "Map"
-	hidden "Lamp" ;XXX development
 
 define-place "Pooh's porch"
 	description "You are standing in front of your very own home - Pooh's home.
@@ -86,7 +85,7 @@
 	description "You can feel the ground becoming soft underneath your feet as
 	you approach the marshes and bogs to the south of the
 	100 Acre wood. Plenty of moss grows around the roots of
-	the trees. Here and there, are willow bends its branches."
+	the trees. Here and there a willow bends its branches."
 	item "Stick"
 	neighbour "Central woods"
 	neighbour "Eastern woods"
@@ -155,6 +154,7 @@
 	the sky."
 	neighbour "Hill"
 	npc "Christopher Robin"
+	item "Card"
 	requires "Magic map"
 
 define-place "Bridge"
@@ -315,13 +315,3 @@
 	neighbour "Sandy pit"
 	neighbour "Rapids"
 	exit-hook "misty-forest"
-
-define-place "The World"
-	description "Well, so you have dared it at last. With the 100 Acre Wood at
-	your back, you face the Great Unknown. Many adventures lie behind
-	you, but the greatest one is still to come. Will you brave it?
-
-	It is called: Life."
-	requires "Maturity"
-	neighbour "Bridge"
-	item "Life"
\ No newline at end of file
diff --git a/doc/HACKING b/doc/HACKING
index e69de29..fef0ff7 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -0,0 +1,186 @@
+==========================
+|| PROGRAMMING ATLANTIS ||
+==========================
+
+So you want to create your own game worlds? Great! Here's what you need to know:
+
+The Atlantis framework itself is written in Common Lisp, a programming language
+with a long history that is nonetheless considered somewhat arcane by many
+programmers today. Fortunately, you do not need to know it in order to create a
+basic game (though it does help if you want to do more advanced stuff).
+
+The majority of coding for a game is done in a custom language called ATL. This
+is a simple descriptive language that should be very easy to pick up, especially
+if you have some previous programming experience. Looking at some of the
+existing game files (e.g. in the folder ATL/Pooh) will already give you a feel
+for the language. The full reference is found below.
+
+This guide is intended to get you started. It is not intended to be a full and
+exhaustive reference to the framework - you are still going to have to do some
+work on your own. But it should see you on your way to creating your very own
+game world. (And if you have questions, don't hesitate to contact me.)
+
+
+ATL SYNTAX
+
+ATL	is line-oriented, with each line being of the form '<keyword> <value>'.
+There must be whitespace between the keyword and the value, and string values
+must be enclosed by double quotes. (A "string" in programming jargon is a series
+of alphanumeric characters, what you might call a "text".) Strings spanning
+multiple lines are concatenated, with leading and trailing whitespace being
+trimmed. Comments begin with a semi-colon and continue to the end of the line.
+
+Most ATL code consists of define blocks. These describe one entity of the game,
+such as a player, an item or a room (for the full list, see below). A define
+block consists of a define command and one to several option commands. It is
+structured as follows:
+
+define-<object> "<object name>"
+	<option 1> <value 1>
+	<option n> <value n>
+
+Note that option commands must be indented. The block is terminated by an empty
+line. If the value of a given option is ommitted, it is set to T (the Common
+Lisp boolean "true" value). Some options can be passed several times, in which
+case each successive value is added to a list that forms the final value. (For
+example, a room can have many neighbours.)
+
+The special command "load-file" takes a string argument and will load the
+specified file. By default, the file will be treated as another ATL file and
+parsed accordingly. However, if the file name ends with ".lisp", it will be
+interpreted as a Lisp extension file. This is a powerful feature, as code loaded
+in this manner has access to the complete Atlantis engine. One can thus expand
+the framework to include custom commands or add special effects to certain game
+objects. More on this below.
+
+
+GAME OBJECTS
+
+The following is a list of all game object types (as given by their define
+commands) with the accompanying options and their default values. NIL denotes
+the empty list - these options may be passed several times (see above).
+
+(TODO - Describe options)
+
+define-player <name>
+	description ""
+	strength 0
+	dexterity 0
+	constitution 0
+	intelligence 0
+	money 0
+	max-health 50
+	health 50
+	item NIL
+	weapon ""
+	armour-class 0
+	place ""
+
+define-place <name>
+	description ""
+	neighbour NIL
+	item NIL
+	hidden NIL
+	monster NIL
+	npc NIL
+	command NIL
+	requires ""
+	entry-hook ""
+	exit-hook ""
+
+define-npc <name>
+	description ""
+	says NIL
+	sells NIL
+	buys NIL
+	quest ""
+	interaction-hook ""
+
+define-monster <name>
+	description ""
+	health 0
+	strength 0
+	dexterity 0
+	aggression 0
+	spawn 0
+	item NIL
+	weapon ""
+	armour-class 0
+	attack-hook ""
+	death-msg ""
+
+define-item <name>
+	description ""
+	cost 0
+	weapon FALSE
+	fixed FALSE
+	infinite FALSE
+	pickup-hook ""
+	drop-hook ""
+	command NIL
+
+define-weapon <name>
+	description ""
+	type ""
+	damage 0
+
+define-quest <name>
+	name ""
+	say-before ""
+	say-after ""
+	proof-item NIL
+	reward-item NIL
+	money 0
+	experience 0
+	infinite FALSE
+
+
+LISP EXPANSIONS
+
+If you are feeling adventurous and know a little Lisp, feel free to write a Lisp
+extension file and integrate it in your game. (You will find an example at
+ATL/Pooh/pooh-extensions.lisp.)
+
+The functions you write here may be used as hooks, or as extra commands for
+places and items. For this purpose, each function must take at least one
+argument, an instance of the current player object. Command functions must also
+take an optional string argument for any parameters found in the player input.
+
+As stated above, Lisp code loaded into the game has access to the full Atlantis
+framework and can call any function. This means that you can, in theory, modify
+anything you like. However, as the code architecture is somewhat complex and is
+subject to frequent, I will not give a full documentation here - if you need to
+know something, look at the examples and read the code ;-)
+
+However, I will provide a brief overview over the different modules and the most
+important functions contained therein. The following files are all to be found
+in the 'lisp' folder.
+
+atlantis.lisp - This is the main game module. It codes for the start menu. The
+			  only thing that concerns us here is the variable *games*, which is
+			  an association list of game names and their respective main ATL
+			  file. All new games must be registered here.
+
+creator.lisp - Not of interest to us.
+
+game-objects.lisp - Defines game object types. Most useful functions:
+				  set-object-attribute and remove-object-attribute, which deal
+				  with the nitty-gritty of manipulating all the different
+				  types.
+
+interpreter.lisp - Do not touch!
+
+player.lisp - Deals with the player object. Most useful functions:
+			change-player-health, add-player-experience and add-player-money
+
+ui.lisp - Defines the in-game commands. Not interesting except as an example for
+		how to implement command functions.
+
+util.lisp - Lots of useful utility functions. Browse at leisure.
+
+world.lisp - Administers the game world instance. Most useful function:
+		   get-game-object, a type-agnostic getter function.
+
+
+Daniel Vedder
+Last modified 10/10/2017
diff --git a/doc/PLAYING b/doc/PLAYING
index 80b4cca..3ea7958 100644
--- a/doc/PLAYING
+++ b/doc/PLAYING
@@ -25,8 +25,8 @@
 
 The first option, "Start a new game", drops you into a submenu in which you can
 choose which game world you want to play. As of Atlantis 0.3, only the "Winnie
-the Pooh" world is fully functional. (You can try the others, but you won't get
-very far.)
+the Pooh" world is fully functional. (You can try the others, but they are far
+from complete.)
 
 The second option, "Load a game", is for returning users who have previously
 saved their game progress in one of the worlds. Again, you will be presented
@@ -59,6 +59,14 @@
 So if you get an error message telling you that a command is not available, make
 sure that you spelt it correctly.
 
+However, having said that, Atlantis will try to guess the correct command from
+an abbreviated input. The rules for this are pretty complex, but as long as your
+input is unambiguous, Atlantis ought to be able to figure out what you meant.
+(Example: Say you are in a room with an NPC called "young child". Then the
+command "l child" will be expanded to "look young child". However, if there is
+also a "crying child" in the room, "l child" is no longer unambiguous and will
+now return an error.)
+
 
 THE GAME SCREEN
 
@@ -69,7 +77,7 @@
 
 Underneath the place description are various lists, starting with neighbouring
 places. There may also be items, NPCs (= non-playing characters) or even
-monsters that you can interact with.
+monsters, all of which you can interact with.
 
 
 CORE COMMANDS
@@ -135,4 +143,4 @@
 
 
 Daniel Vedder
-Last modified 10/08/2017
+Last modified 10/10/2017
diff --git a/doc/TODO b/doc/TODO
index ef5aba7..4b9efb4 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,17 +1,14 @@
 ATLANTIS TODO
 
 LISP
-* prevent illegal input characters from causing a crash
-* test all commands again after fuzzy-matching was added
+* prevent illegal input characters from causing a crash -> PRIORITY
 * split ui.lisp into two modules (one for interaction functions)
 	
 ATL	
 * fill in missing place descriptions
 * hide 2 more pots of honey
-* require XP minimum to finish game?
 * think of more quests
 * integrate the quests to lead the player through the game
-* remove "The World" again, games should finish at Galleon's lap
 
 
 NOTES
diff --git a/lisp/interpreter.lisp b/lisp/interpreter.lisp
index d7de231..93506fa 100644
--- a/lisp/interpreter.lisp
+++ b/lisp/interpreter.lisp
@@ -13,6 +13,7 @@
 
 ;; A list of ATL language constructs
 ;; (Note: not complete - each (defcommand) appends to this list)
+;; FIXME name-world is currently superfluous
 (defvar *atl-commands* '(load-file name-world))
 
 (defun build-define-command (object-type)

diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl
index 1d517e0..3311e11 100644
--- a/ATL/Pooh/items.atl
+++ b/ATL/Pooh/items.atl
@@ -119,7 +119,7 @@
 	a good idea to carry this around with you..."
 	command "study"
 
-define-item "Life"
+define-item "Card"
 	description "
 	...................................
 	...................................
@@ -129,8 +129,7 @@
 	...................................
 	...................................
 	"
-	fixed
-
+	
 define-item "Magic map"
 	description "This is a strange map. It always seems to be changing. One
 	moment it will show you one thing, the next something completely
diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp
index c9e3365..2d7d259 100644
--- a/ATL/Pooh/pooh-extensions.lisp
+++ b/ATL/Pooh/pooh-extensions.lisp
@@ -9,6 +9,7 @@
 
 (defun eat (player &optional arg)
 	"Allow the player to eat something."
+	;; XXX If any other edibles are added, split this function up
 	(cond ((null arg) (format t "~&What do you want to eat?"))
 		;; Berries can be eaten any time, but don't have any effect
 		((and (equalp arg "berries")
diff --git a/ATL/Pooh/pooh.atl b/ATL/Pooh/pooh.atl
index 5e16ced..fce7dbb 100644
--- a/ATL/Pooh/pooh.atl
+++ b/ATL/Pooh/pooh.atl
@@ -6,7 +6,7 @@
 ; author: Daniel Vedder
 ; date: 07/06/2017
 
-name-world "100 Acre Wood"
+name-world "100 Acre Wood" ;TODO Remove this
 
 load-file "pooh-extensions.lisp"
 load-file "woodland-map.lisp"
@@ -22,7 +22,7 @@
 	strength 1
 	dexterity 4
 	constitution 4
-
+	
 define-player "Christopher Robin"
 	description "Christopher Robin is my game dev character."
 	place "Piglet's porch" ;Development
diff --git a/ATL/Pooh/woods.atl b/ATL/Pooh/woods.atl
index a8d5840..d965b4f 100644
--- a/ATL/Pooh/woods.atl
+++ b/ATL/Pooh/woods.atl
@@ -15,7 +15,6 @@
 	item "Hunny"
 	item "Jar"
 	item "Map"
-	hidden "Lamp" ;XXX development
 
 define-place "Pooh's porch"
 	description "You are standing in front of your very own home - Pooh's home.
@@ -86,7 +85,7 @@
 	description "You can feel the ground becoming soft underneath your feet as
 	you approach the marshes and bogs to the south of the
 	100 Acre wood. Plenty of moss grows around the roots of
-	the trees. Here and there, are willow bends its branches."
+	the trees. Here and there a willow bends its branches."
 	item "Stick"
 	neighbour "Central woods"
 	neighbour "Eastern woods"
@@ -155,6 +154,7 @@
 	the sky."
 	neighbour "Hill"
 	npc "Christopher Robin"
+	item "Card"
 	requires "Magic map"
 
 define-place "Bridge"
@@ -315,13 +315,3 @@
 	neighbour "Sandy pit"
 	neighbour "Rapids"
 	exit-hook "misty-forest"
-
-define-place "The World"
-	description "Well, so you have dared it at last. With the 100 Acre Wood at
-	your back, you face the Great Unknown. Many adventures lie behind
-	you, but the greatest one is still to come. Will you brave it?
-
-	It is called: Life."
-	requires "Maturity"
-	neighbour "Bridge"
-	item "Life"
\ No newline at end of file
diff --git a/doc/HACKING b/doc/HACKING
index e69de29..fef0ff7 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -0,0 +1,186 @@
+==========================
+|| PROGRAMMING ATLANTIS ||
+==========================
+
+So you want to create your own game worlds? Great! Here's what you need to know:
+
+The Atlantis framework itself is written in Common Lisp, a programming language
+with a long history that is nonetheless considered somewhat arcane by many
+programmers today. Fortunately, you do not need to know it in order to create a
+basic game (though it does help if you want to do more advanced stuff).
+
+The majority of coding for a game is done in a custom language called ATL. This
+is a simple descriptive language that should be very easy to pick up, especially
+if you have some previous programming experience. Looking at some of the
+existing game files (e.g. in the folder ATL/Pooh) will already give you a feel
+for the language. The full reference is found below.
+
+This guide is intended to get you started. It is not intended to be a full and
+exhaustive reference to the framework - you are still going to have to do some
+work on your own. But it should see you on your way to creating your very own
+game world. (And if you have questions, don't hesitate to contact me.)
+
+
+ATL SYNTAX
+
+ATL	is line-oriented, with each line being of the form '<keyword> <value>'.
+There must be whitespace between the keyword and the value, and string values
+must be enclosed by double quotes. (A "string" in programming jargon is a series
+of alphanumeric characters, what you might call a "text".) Strings spanning
+multiple lines are concatenated, with leading and trailing whitespace being
+trimmed. Comments begin with a semi-colon and continue to the end of the line.
+
+Most ATL code consists of define blocks. These describe one entity of the game,
+such as a player, an item or a room (for the full list, see below). A define
+block consists of a define command and one to several option commands. It is
+structured as follows:
+
+define-<object> "<object name>"
+	<option 1> <value 1>
+	<option n> <value n>
+
+Note that option commands must be indented. The block is terminated by an empty
+line. If the value of a given option is ommitted, it is set to T (the Common
+Lisp boolean "true" value). Some options can be passed several times, in which
+case each successive value is added to a list that forms the final value. (For
+example, a room can have many neighbours.)
+
+The special command "load-file" takes a string argument and will load the
+specified file. By default, the file will be treated as another ATL file and
+parsed accordingly. However, if the file name ends with ".lisp", it will be
+interpreted as a Lisp extension file. This is a powerful feature, as code loaded
+in this manner has access to the complete Atlantis engine. One can thus expand
+the framework to include custom commands or add special effects to certain game
+objects. More on this below.
+
+
+GAME OBJECTS
+
+The following is a list of all game object types (as given by their define
+commands) with the accompanying options and their default values. NIL denotes
+the empty list - these options may be passed several times (see above).
+
+(TODO - Describe options)
+
+define-player <name>
+	description ""
+	strength 0
+	dexterity 0
+	constitution 0
+	intelligence 0
+	money 0
+	max-health 50
+	health 50
+	item NIL
+	weapon ""
+	armour-class 0
+	place ""
+
+define-place <name>
+	description ""
+	neighbour NIL
+	item NIL
+	hidden NIL
+	monster NIL
+	npc NIL
+	command NIL
+	requires ""
+	entry-hook ""
+	exit-hook ""
+
+define-npc <name>
+	description ""
+	says NIL
+	sells NIL
+	buys NIL
+	quest ""
+	interaction-hook ""
+
+define-monster <name>
+	description ""
+	health 0
+	strength 0
+	dexterity 0
+	aggression 0
+	spawn 0
+	item NIL
+	weapon ""
+	armour-class 0
+	attack-hook ""
+	death-msg ""
+
+define-item <name>
+	description ""
+	cost 0
+	weapon FALSE
+	fixed FALSE
+	infinite FALSE
+	pickup-hook ""
+	drop-hook ""
+	command NIL
+
+define-weapon <name>
+	description ""
+	type ""
+	damage 0
+
+define-quest <name>
+	name ""
+	say-before ""
+	say-after ""
+	proof-item NIL
+	reward-item NIL
+	money 0
+	experience 0
+	infinite FALSE
+
+
+LISP EXPANSIONS
+
+If you are feeling adventurous and know a little Lisp, feel free to write a Lisp
+extension file and integrate it in your game. (You will find an example at
+ATL/Pooh/pooh-extensions.lisp.)
+
+The functions you write here may be used as hooks, or as extra commands for
+places and items. For this purpose, each function must take at least one
+argument, an instance of the current player object. Command functions must also
+take an optional string argument for any parameters found in the player input.
+
+As stated above, Lisp code loaded into the game has access to the full Atlantis
+framework and can call any function. This means that you can, in theory, modify
+anything you like. However, as the code architecture is somewhat complex and is
+subject to frequent, I will not give a full documentation here - if you need to
+know something, look at the examples and read the code ;-)
+
+However, I will provide a brief overview over the different modules and the most
+important functions contained therein. The following files are all to be found
+in the 'lisp' folder.
+
+atlantis.lisp - This is the main game module. It codes for the start menu. The
+			  only thing that concerns us here is the variable *games*, which is
+			  an association list of game names and their respective main ATL
+			  file. All new games must be registered here.
+
+creator.lisp - Not of interest to us.
+
+game-objects.lisp - Defines game object types. Most useful functions:
+				  set-object-attribute and remove-object-attribute, which deal
+				  with the nitty-gritty of manipulating all the different
+				  types.
+
+interpreter.lisp - Do not touch!
+
+player.lisp - Deals with the player object. Most useful functions:
+			change-player-health, add-player-experience and add-player-money
+
+ui.lisp - Defines the in-game commands. Not interesting except as an example for
+		how to implement command functions.
+
+util.lisp - Lots of useful utility functions. Browse at leisure.
+
+world.lisp - Administers the game world instance. Most useful function:
+		   get-game-object, a type-agnostic getter function.
+
+
+Daniel Vedder
+Last modified 10/10/2017
diff --git a/doc/PLAYING b/doc/PLAYING
index 80b4cca..3ea7958 100644
--- a/doc/PLAYING
+++ b/doc/PLAYING
@@ -25,8 +25,8 @@
 
 The first option, "Start a new game", drops you into a submenu in which you can
 choose which game world you want to play. As of Atlantis 0.3, only the "Winnie
-the Pooh" world is fully functional. (You can try the others, but you won't get
-very far.)
+the Pooh" world is fully functional. (You can try the others, but they are far
+from complete.)
 
 The second option, "Load a game", is for returning users who have previously
 saved their game progress in one of the worlds. Again, you will be presented
@@ -59,6 +59,14 @@
 So if you get an error message telling you that a command is not available, make
 sure that you spelt it correctly.
 
+However, having said that, Atlantis will try to guess the correct command from
+an abbreviated input. The rules for this are pretty complex, but as long as your
+input is unambiguous, Atlantis ought to be able to figure out what you meant.
+(Example: Say you are in a room with an NPC called "young child". Then the
+command "l child" will be expanded to "look young child". However, if there is
+also a "crying child" in the room, "l child" is no longer unambiguous and will
+now return an error.)
+
 
 THE GAME SCREEN
 
@@ -69,7 +77,7 @@
 
 Underneath the place description are various lists, starting with neighbouring
 places. There may also be items, NPCs (= non-playing characters) or even
-monsters that you can interact with.
+monsters, all of which you can interact with.
 
 
 CORE COMMANDS
@@ -135,4 +143,4 @@
 
 
 Daniel Vedder
-Last modified 10/08/2017
+Last modified 10/10/2017
diff --git a/doc/TODO b/doc/TODO
index ef5aba7..4b9efb4 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,17 +1,14 @@
 ATLANTIS TODO
 
 LISP
-* prevent illegal input characters from causing a crash
-* test all commands again after fuzzy-matching was added
+* prevent illegal input characters from causing a crash -> PRIORITY
 * split ui.lisp into two modules (one for interaction functions)
 	
 ATL	
 * fill in missing place descriptions
 * hide 2 more pots of honey
-* require XP minimum to finish game?
 * think of more quests
 * integrate the quests to lead the player through the game
-* remove "The World" again, games should finish at Galleon's lap
 
 
 NOTES
diff --git a/lisp/interpreter.lisp b/lisp/interpreter.lisp
index d7de231..93506fa 100644
--- a/lisp/interpreter.lisp
+++ b/lisp/interpreter.lisp
@@ -13,6 +13,7 @@
 
 ;; A list of ATL language constructs
 ;; (Note: not complete - each (defcommand) appends to this list)
+;; FIXME name-world is currently superfluous
 (defvar *atl-commands* '(load-file name-world))
 
 (defun build-define-command (object-type)
diff --git a/lisp/player.lisp b/lisp/player.lisp
index f693914..1c51a05 100644
--- a/lisp/player.lisp
+++ b/lisp/player.lisp
@@ -59,6 +59,7 @@
 		(funcall list-function object-type player)))
 
 (defun player-has-ability (ability player)
+	;;TODO Remove this
 	"Check whether a player has the given ability"
 	(or	(member ability (player-ability player) :test #'equalp)
 		(dolist (i (player-item player) NIL)

diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl
index 1d517e0..3311e11 100644
--- a/ATL/Pooh/items.atl
+++ b/ATL/Pooh/items.atl
@@ -119,7 +119,7 @@
 	a good idea to carry this around with you..."
 	command "study"
 
-define-item "Life"
+define-item "Card"
 	description "
 	...................................
 	...................................
@@ -129,8 +129,7 @@
 	...................................
 	...................................
 	"
-	fixed
-
+	
 define-item "Magic map"
 	description "This is a strange map. It always seems to be changing. One
 	moment it will show you one thing, the next something completely
diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp
index c9e3365..2d7d259 100644
--- a/ATL/Pooh/pooh-extensions.lisp
+++ b/ATL/Pooh/pooh-extensions.lisp
@@ -9,6 +9,7 @@
 
 (defun eat (player &optional arg)
 	"Allow the player to eat something."
+	;; XXX If any other edibles are added, split this function up
 	(cond ((null arg) (format t "~&What do you want to eat?"))
 		;; Berries can be eaten any time, but don't have any effect
 		((and (equalp arg "berries")
diff --git a/ATL/Pooh/pooh.atl b/ATL/Pooh/pooh.atl
index 5e16ced..fce7dbb 100644
--- a/ATL/Pooh/pooh.atl
+++ b/ATL/Pooh/pooh.atl
@@ -6,7 +6,7 @@
 ; author: Daniel Vedder
 ; date: 07/06/2017
 
-name-world "100 Acre Wood"
+name-world "100 Acre Wood" ;TODO Remove this
 
 load-file "pooh-extensions.lisp"
 load-file "woodland-map.lisp"
@@ -22,7 +22,7 @@
 	strength 1
 	dexterity 4
 	constitution 4
-
+	
 define-player "Christopher Robin"
 	description "Christopher Robin is my game dev character."
 	place "Piglet's porch" ;Development
diff --git a/ATL/Pooh/woods.atl b/ATL/Pooh/woods.atl
index a8d5840..d965b4f 100644
--- a/ATL/Pooh/woods.atl
+++ b/ATL/Pooh/woods.atl
@@ -15,7 +15,6 @@
 	item "Hunny"
 	item "Jar"
 	item "Map"
-	hidden "Lamp" ;XXX development
 
 define-place "Pooh's porch"
 	description "You are standing in front of your very own home - Pooh's home.
@@ -86,7 +85,7 @@
 	description "You can feel the ground becoming soft underneath your feet as
 	you approach the marshes and bogs to the south of the
 	100 Acre wood. Plenty of moss grows around the roots of
-	the trees. Here and there, are willow bends its branches."
+	the trees. Here and there a willow bends its branches."
 	item "Stick"
 	neighbour "Central woods"
 	neighbour "Eastern woods"
@@ -155,6 +154,7 @@
 	the sky."
 	neighbour "Hill"
 	npc "Christopher Robin"
+	item "Card"
 	requires "Magic map"
 
 define-place "Bridge"
@@ -315,13 +315,3 @@
 	neighbour "Sandy pit"
 	neighbour "Rapids"
 	exit-hook "misty-forest"
-
-define-place "The World"
-	description "Well, so you have dared it at last. With the 100 Acre Wood at
-	your back, you face the Great Unknown. Many adventures lie behind
-	you, but the greatest one is still to come. Will you brave it?
-
-	It is called: Life."
-	requires "Maturity"
-	neighbour "Bridge"
-	item "Life"
\ No newline at end of file
diff --git a/doc/HACKING b/doc/HACKING
index e69de29..fef0ff7 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -0,0 +1,186 @@
+==========================
+|| PROGRAMMING ATLANTIS ||
+==========================
+
+So you want to create your own game worlds? Great! Here's what you need to know:
+
+The Atlantis framework itself is written in Common Lisp, a programming language
+with a long history that is nonetheless considered somewhat arcane by many
+programmers today. Fortunately, you do not need to know it in order to create a
+basic game (though it does help if you want to do more advanced stuff).
+
+The majority of coding for a game is done in a custom language called ATL. This
+is a simple descriptive language that should be very easy to pick up, especially
+if you have some previous programming experience. Looking at some of the
+existing game files (e.g. in the folder ATL/Pooh) will already give you a feel
+for the language. The full reference is found below.
+
+This guide is intended to get you started. It is not intended to be a full and
+exhaustive reference to the framework - you are still going to have to do some
+work on your own. But it should see you on your way to creating your very own
+game world. (And if you have questions, don't hesitate to contact me.)
+
+
+ATL SYNTAX
+
+ATL	is line-oriented, with each line being of the form '<keyword> <value>'.
+There must be whitespace between the keyword and the value, and string values
+must be enclosed by double quotes. (A "string" in programming jargon is a series
+of alphanumeric characters, what you might call a "text".) Strings spanning
+multiple lines are concatenated, with leading and trailing whitespace being
+trimmed. Comments begin with a semi-colon and continue to the end of the line.
+
+Most ATL code consists of define blocks. These describe one entity of the game,
+such as a player, an item or a room (for the full list, see below). A define
+block consists of a define command and one to several option commands. It is
+structured as follows:
+
+define-<object> "<object name>"
+	<option 1> <value 1>
+	<option n> <value n>
+
+Note that option commands must be indented. The block is terminated by an empty
+line. If the value of a given option is ommitted, it is set to T (the Common
+Lisp boolean "true" value). Some options can be passed several times, in which
+case each successive value is added to a list that forms the final value. (For
+example, a room can have many neighbours.)
+
+The special command "load-file" takes a string argument and will load the
+specified file. By default, the file will be treated as another ATL file and
+parsed accordingly. However, if the file name ends with ".lisp", it will be
+interpreted as a Lisp extension file. This is a powerful feature, as code loaded
+in this manner has access to the complete Atlantis engine. One can thus expand
+the framework to include custom commands or add special effects to certain game
+objects. More on this below.
+
+
+GAME OBJECTS
+
+The following is a list of all game object types (as given by their define
+commands) with the accompanying options and their default values. NIL denotes
+the empty list - these options may be passed several times (see above).
+
+(TODO - Describe options)
+
+define-player <name>
+	description ""
+	strength 0
+	dexterity 0
+	constitution 0
+	intelligence 0
+	money 0
+	max-health 50
+	health 50
+	item NIL
+	weapon ""
+	armour-class 0
+	place ""
+
+define-place <name>
+	description ""
+	neighbour NIL
+	item NIL
+	hidden NIL
+	monster NIL
+	npc NIL
+	command NIL
+	requires ""
+	entry-hook ""
+	exit-hook ""
+
+define-npc <name>
+	description ""
+	says NIL
+	sells NIL
+	buys NIL
+	quest ""
+	interaction-hook ""
+
+define-monster <name>
+	description ""
+	health 0
+	strength 0
+	dexterity 0
+	aggression 0
+	spawn 0
+	item NIL
+	weapon ""
+	armour-class 0
+	attack-hook ""
+	death-msg ""
+
+define-item <name>
+	description ""
+	cost 0
+	weapon FALSE
+	fixed FALSE
+	infinite FALSE
+	pickup-hook ""
+	drop-hook ""
+	command NIL
+
+define-weapon <name>
+	description ""
+	type ""
+	damage 0
+
+define-quest <name>
+	name ""
+	say-before ""
+	say-after ""
+	proof-item NIL
+	reward-item NIL
+	money 0
+	experience 0
+	infinite FALSE
+
+
+LISP EXPANSIONS
+
+If you are feeling adventurous and know a little Lisp, feel free to write a Lisp
+extension file and integrate it in your game. (You will find an example at
+ATL/Pooh/pooh-extensions.lisp.)
+
+The functions you write here may be used as hooks, or as extra commands for
+places and items. For this purpose, each function must take at least one
+argument, an instance of the current player object. Command functions must also
+take an optional string argument for any parameters found in the player input.
+
+As stated above, Lisp code loaded into the game has access to the full Atlantis
+framework and can call any function. This means that you can, in theory, modify
+anything you like. However, as the code architecture is somewhat complex and is
+subject to frequent, I will not give a full documentation here - if you need to
+know something, look at the examples and read the code ;-)
+
+However, I will provide a brief overview over the different modules and the most
+important functions contained therein. The following files are all to be found
+in the 'lisp' folder.
+
+atlantis.lisp - This is the main game module. It codes for the start menu. The
+			  only thing that concerns us here is the variable *games*, which is
+			  an association list of game names and their respective main ATL
+			  file. All new games must be registered here.
+
+creator.lisp - Not of interest to us.
+
+game-objects.lisp - Defines game object types. Most useful functions:
+				  set-object-attribute and remove-object-attribute, which deal
+				  with the nitty-gritty of manipulating all the different
+				  types.
+
+interpreter.lisp - Do not touch!
+
+player.lisp - Deals with the player object. Most useful functions:
+			change-player-health, add-player-experience and add-player-money
+
+ui.lisp - Defines the in-game commands. Not interesting except as an example for
+		how to implement command functions.
+
+util.lisp - Lots of useful utility functions. Browse at leisure.
+
+world.lisp - Administers the game world instance. Most useful function:
+		   get-game-object, a type-agnostic getter function.
+
+
+Daniel Vedder
+Last modified 10/10/2017
diff --git a/doc/PLAYING b/doc/PLAYING
index 80b4cca..3ea7958 100644
--- a/doc/PLAYING
+++ b/doc/PLAYING
@@ -25,8 +25,8 @@
 
 The first option, "Start a new game", drops you into a submenu in which you can
 choose which game world you want to play. As of Atlantis 0.3, only the "Winnie
-the Pooh" world is fully functional. (You can try the others, but you won't get
-very far.)
+the Pooh" world is fully functional. (You can try the others, but they are far
+from complete.)
 
 The second option, "Load a game", is for returning users who have previously
 saved their game progress in one of the worlds. Again, you will be presented
@@ -59,6 +59,14 @@
 So if you get an error message telling you that a command is not available, make
 sure that you spelt it correctly.
 
+However, having said that, Atlantis will try to guess the correct command from
+an abbreviated input. The rules for this are pretty complex, but as long as your
+input is unambiguous, Atlantis ought to be able to figure out what you meant.
+(Example: Say you are in a room with an NPC called "young child". Then the
+command "l child" will be expanded to "look young child". However, if there is
+also a "crying child" in the room, "l child" is no longer unambiguous and will
+now return an error.)
+
 
 THE GAME SCREEN
 
@@ -69,7 +77,7 @@
 
 Underneath the place description are various lists, starting with neighbouring
 places. There may also be items, NPCs (= non-playing characters) or even
-monsters that you can interact with.
+monsters, all of which you can interact with.
 
 
 CORE COMMANDS
@@ -135,4 +143,4 @@
 
 
 Daniel Vedder
-Last modified 10/08/2017
+Last modified 10/10/2017
diff --git a/doc/TODO b/doc/TODO
index ef5aba7..4b9efb4 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,17 +1,14 @@
 ATLANTIS TODO
 
 LISP
-* prevent illegal input characters from causing a crash
-* test all commands again after fuzzy-matching was added
+* prevent illegal input characters from causing a crash -> PRIORITY
 * split ui.lisp into two modules (one for interaction functions)
 	
 ATL	
 * fill in missing place descriptions
 * hide 2 more pots of honey
-* require XP minimum to finish game?
 * think of more quests
 * integrate the quests to lead the player through the game
-* remove "The World" again, games should finish at Galleon's lap
 
 
 NOTES
diff --git a/lisp/interpreter.lisp b/lisp/interpreter.lisp
index d7de231..93506fa 100644
--- a/lisp/interpreter.lisp
+++ b/lisp/interpreter.lisp
@@ -13,6 +13,7 @@
 
 ;; A list of ATL language constructs
 ;; (Note: not complete - each (defcommand) appends to this list)
+;; FIXME name-world is currently superfluous
 (defvar *atl-commands* '(load-file name-world))
 
 (defun build-define-command (object-type)
diff --git a/lisp/player.lisp b/lisp/player.lisp
index f693914..1c51a05 100644
--- a/lisp/player.lisp
+++ b/lisp/player.lisp
@@ -59,6 +59,7 @@
 		(funcall list-function object-type player)))
 
 (defun player-has-ability (ability player)
+	;;TODO Remove this
 	"Check whether a player has the given ability"
 	(or	(member ability (player-ability player) :test #'equalp)
 		(dolist (i (player-item player) NIL)
diff --git a/lisp/ui.lisp b/lisp/ui.lisp
index 85237ee..5964e01 100644
--- a/lisp/ui.lisp
+++ b/lisp/ui.lisp
@@ -239,7 +239,7 @@
 		(return-from talk))
 	;; Allow for a bit of syntactic sugar
 	(let ((split-name (cut-string npc-name 3)))
-		(when (and (< 2 (length split-name)) (equalp (first split-name) "to "))
+		(when (and (< 1 (length split-name)) (equalp (first split-name) "to "))
 			(setf npc-name (second split-name))))
 	(let* ((place (get-game-object 'place (player-place player)))
 			  (npc-name (fuzzy-match npc-name (place-npc place)))

diff --git a/ATL/Pooh/items.atl b/ATL/Pooh/items.atl
index 1d517e0..3311e11 100644
--- a/ATL/Pooh/items.atl
+++ b/ATL/Pooh/items.atl
@@ -119,7 +119,7 @@
 	a good idea to carry this around with you..."
 	command "study"
 
-define-item "Life"
+define-item "Card"
 	description "
 	...................................
 	...................................
@@ -129,8 +129,7 @@
 	...................................
 	...................................
 	"
-	fixed
-
+	
 define-item "Magic map"
 	description "This is a strange map. It always seems to be changing. One
 	moment it will show you one thing, the next something completely
diff --git a/ATL/Pooh/pooh-extensions.lisp b/ATL/Pooh/pooh-extensions.lisp
index c9e3365..2d7d259 100644
--- a/ATL/Pooh/pooh-extensions.lisp
+++ b/ATL/Pooh/pooh-extensions.lisp
@@ -9,6 +9,7 @@
 
 (defun eat (player &optional arg)
 	"Allow the player to eat something."
+	;; XXX If any other edibles are added, split this function up
 	(cond ((null arg) (format t "~&What do you want to eat?"))
 		;; Berries can be eaten any time, but don't have any effect
 		((and (equalp arg "berries")
diff --git a/ATL/Pooh/pooh.atl b/ATL/Pooh/pooh.atl
index 5e16ced..fce7dbb 100644
--- a/ATL/Pooh/pooh.atl
+++ b/ATL/Pooh/pooh.atl
@@ -6,7 +6,7 @@
 ; author: Daniel Vedder
 ; date: 07/06/2017
 
-name-world "100 Acre Wood"
+name-world "100 Acre Wood" ;TODO Remove this
 
 load-file "pooh-extensions.lisp"
 load-file "woodland-map.lisp"
@@ -22,7 +22,7 @@
 	strength 1
 	dexterity 4
 	constitution 4
-
+	
 define-player "Christopher Robin"
 	description "Christopher Robin is my game dev character."
 	place "Piglet's porch" ;Development
diff --git a/ATL/Pooh/woods.atl b/ATL/Pooh/woods.atl
index a8d5840..d965b4f 100644
--- a/ATL/Pooh/woods.atl
+++ b/ATL/Pooh/woods.atl
@@ -15,7 +15,6 @@
 	item "Hunny"
 	item "Jar"
 	item "Map"
-	hidden "Lamp" ;XXX development
 
 define-place "Pooh's porch"
 	description "You are standing in front of your very own home - Pooh's home.
@@ -86,7 +85,7 @@
 	description "You can feel the ground becoming soft underneath your feet as
 	you approach the marshes and bogs to the south of the
 	100 Acre wood. Plenty of moss grows around the roots of
-	the trees. Here and there, are willow bends its branches."
+	the trees. Here and there a willow bends its branches."
 	item "Stick"
 	neighbour "Central woods"
 	neighbour "Eastern woods"
@@ -155,6 +154,7 @@
 	the sky."
 	neighbour "Hill"
 	npc "Christopher Robin"
+	item "Card"
 	requires "Magic map"
 
 define-place "Bridge"
@@ -315,13 +315,3 @@
 	neighbour "Sandy pit"
 	neighbour "Rapids"
 	exit-hook "misty-forest"
-
-define-place "The World"
-	description "Well, so you have dared it at last. With the 100 Acre Wood at
-	your back, you face the Great Unknown. Many adventures lie behind
-	you, but the greatest one is still to come. Will you brave it?
-
-	It is called: Life."
-	requires "Maturity"
-	neighbour "Bridge"
-	item "Life"
\ No newline at end of file
diff --git a/doc/HACKING b/doc/HACKING
index e69de29..fef0ff7 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -0,0 +1,186 @@
+==========================
+|| PROGRAMMING ATLANTIS ||
+==========================
+
+So you want to create your own game worlds? Great! Here's what you need to know:
+
+The Atlantis framework itself is written in Common Lisp, a programming language
+with a long history that is nonetheless considered somewhat arcane by many
+programmers today. Fortunately, you do not need to know it in order to create a
+basic game (though it does help if you want to do more advanced stuff).
+
+The majority of coding for a game is done in a custom language called ATL. This
+is a simple descriptive language that should be very easy to pick up, especially
+if you have some previous programming experience. Looking at some of the
+existing game files (e.g. in the folder ATL/Pooh) will already give you a feel
+for the language. The full reference is found below.
+
+This guide is intended to get you started. It is not intended to be a full and
+exhaustive reference to the framework - you are still going to have to do some
+work on your own. But it should see you on your way to creating your very own
+game world. (And if you have questions, don't hesitate to contact me.)
+
+
+ATL SYNTAX
+
+ATL	is line-oriented, with each line being of the form '<keyword> <value>'.
+There must be whitespace between the keyword and the value, and string values
+must be enclosed by double quotes. (A "string" in programming jargon is a series
+of alphanumeric characters, what you might call a "text".) Strings spanning
+multiple lines are concatenated, with leading and trailing whitespace being
+trimmed. Comments begin with a semi-colon and continue to the end of the line.
+
+Most ATL code consists of define blocks. These describe one entity of the game,
+such as a player, an item or a room (for the full list, see below). A define
+block consists of a define command and one to several option commands. It is
+structured as follows:
+
+define-<object> "<object name>"
+	<option 1> <value 1>
+	<option n> <value n>
+
+Note that option commands must be indented. The block is terminated by an empty
+line. If the value of a given option is ommitted, it is set to T (the Common
+Lisp boolean "true" value). Some options can be passed several times, in which
+case each successive value is added to a list that forms the final value. (For
+example, a room can have many neighbours.)
+
+The special command "load-file" takes a string argument and will load the
+specified file. By default, the file will be treated as another ATL file and
+parsed accordingly. However, if the file name ends with ".lisp", it will be
+interpreted as a Lisp extension file. This is a powerful feature, as code loaded
+in this manner has access to the complete Atlantis engine. One can thus expand
+the framework to include custom commands or add special effects to certain game
+objects. More on this below.
+
+
+GAME OBJECTS
+
+The following is a list of all game object types (as given by their define
+commands) with the accompanying options and their default values. NIL denotes
+the empty list - these options may be passed several times (see above).
+
+(TODO - Describe options)
+
+define-player <name>
+	description ""
+	strength 0
+	dexterity 0
+	constitution 0
+	intelligence 0
+	money 0
+	max-health 50
+	health 50
+	item NIL
+	weapon ""
+	armour-class 0
+	place ""
+
+define-place <name>
+	description ""
+	neighbour NIL
+	item NIL
+	hidden NIL
+	monster NIL
+	npc NIL
+	command NIL
+	requires ""
+	entry-hook ""
+	exit-hook ""
+
+define-npc <name>
+	description ""
+	says NIL
+	sells NIL
+	buys NIL
+	quest ""
+	interaction-hook ""
+
+define-monster <name>
+	description ""
+	health 0
+	strength 0
+	dexterity 0
+	aggression 0
+	spawn 0
+	item NIL
+	weapon ""
+	armour-class 0
+	attack-hook ""
+	death-msg ""
+
+define-item <name>
+	description ""
+	cost 0
+	weapon FALSE
+	fixed FALSE
+	infinite FALSE
+	pickup-hook ""
+	drop-hook ""
+	command NIL
+
+define-weapon <name>
+	description ""
+	type ""
+	damage 0
+
+define-quest <name>
+	name ""
+	say-before ""
+	say-after ""
+	proof-item NIL
+	reward-item NIL
+	money 0
+	experience 0
+	infinite FALSE
+
+
+LISP EXPANSIONS
+
+If you are feeling adventurous and know a little Lisp, feel free to write a Lisp
+extension file and integrate it in your game. (You will find an example at
+ATL/Pooh/pooh-extensions.lisp.)
+
+The functions you write here may be used as hooks, or as extra commands for
+places and items. For this purpose, each function must take at least one
+argument, an instance of the current player object. Command functions must also
+take an optional string argument for any parameters found in the player input.
+
+As stated above, Lisp code loaded into the game has access to the full Atlantis
+framework and can call any function. This means that you can, in theory, modify
+anything you like. However, as the code architecture is somewhat complex and is
+subject to frequent, I will not give a full documentation here - if you need to
+know something, look at the examples and read the code ;-)
+
+However, I will provide a brief overview over the different modules and the most
+important functions contained therein. The following files are all to be found
+in the 'lisp' folder.
+
+atlantis.lisp - This is the main game module. It codes for the start menu. The
+			  only thing that concerns us here is the variable *games*, which is
+			  an association list of game names and their respective main ATL
+			  file. All new games must be registered here.
+
+creator.lisp - Not of interest to us.
+
+game-objects.lisp - Defines game object types. Most useful functions:
+				  set-object-attribute and remove-object-attribute, which deal
+				  with the nitty-gritty of manipulating all the different
+				  types.
+
+interpreter.lisp - Do not touch!
+
+player.lisp - Deals with the player object. Most useful functions:
+			change-player-health, add-player-experience and add-player-money
+
+ui.lisp - Defines the in-game commands. Not interesting except as an example for
+		how to implement command functions.
+
+util.lisp - Lots of useful utility functions. Browse at leisure.
+
+world.lisp - Administers the game world instance. Most useful function:
+		   get-game-object, a type-agnostic getter function.
+
+
+Daniel Vedder
+Last modified 10/10/2017
diff --git a/doc/PLAYING b/doc/PLAYING
index 80b4cca..3ea7958 100644
--- a/doc/PLAYING
+++ b/doc/PLAYING
@@ -25,8 +25,8 @@
 
 The first option, "Start a new game", drops you into a submenu in which you can
 choose which game world you want to play. As of Atlantis 0.3, only the "Winnie
-the Pooh" world is fully functional. (You can try the others, but you won't get
-very far.)
+the Pooh" world is fully functional. (You can try the others, but they are far
+from complete.)
 
 The second option, "Load a game", is for returning users who have previously
 saved their game progress in one of the worlds. Again, you will be presented
@@ -59,6 +59,14 @@
 So if you get an error message telling you that a command is not available, make
 sure that you spelt it correctly.
 
+However, having said that, Atlantis will try to guess the correct command from
+an abbreviated input. The rules for this are pretty complex, but as long as your
+input is unambiguous, Atlantis ought to be able to figure out what you meant.
+(Example: Say you are in a room with an NPC called "young child". Then the
+command "l child" will be expanded to "look young child". However, if there is
+also a "crying child" in the room, "l child" is no longer unambiguous and will
+now return an error.)
+
 
 THE GAME SCREEN
 
@@ -69,7 +77,7 @@
 
 Underneath the place description are various lists, starting with neighbouring
 places. There may also be items, NPCs (= non-playing characters) or even
-monsters that you can interact with.
+monsters, all of which you can interact with.
 
 
 CORE COMMANDS
@@ -135,4 +143,4 @@
 
 
 Daniel Vedder
-Last modified 10/08/2017
+Last modified 10/10/2017
diff --git a/doc/TODO b/doc/TODO
index ef5aba7..4b9efb4 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,17 +1,14 @@
 ATLANTIS TODO
 
 LISP
-* prevent illegal input characters from causing a crash
-* test all commands again after fuzzy-matching was added
+* prevent illegal input characters from causing a crash -> PRIORITY
 * split ui.lisp into two modules (one for interaction functions)
 	
 ATL	
 * fill in missing place descriptions
 * hide 2 more pots of honey
-* require XP minimum to finish game?
 * think of more quests
 * integrate the quests to lead the player through the game
-* remove "The World" again, games should finish at Galleon's lap
 
 
 NOTES
diff --git a/lisp/interpreter.lisp b/lisp/interpreter.lisp
index d7de231..93506fa 100644
--- a/lisp/interpreter.lisp
+++ b/lisp/interpreter.lisp
@@ -13,6 +13,7 @@
 
 ;; A list of ATL language constructs
 ;; (Note: not complete - each (defcommand) appends to this list)
+;; FIXME name-world is currently superfluous
 (defvar *atl-commands* '(load-file name-world))
 
 (defun build-define-command (object-type)
diff --git a/lisp/player.lisp b/lisp/player.lisp
index f693914..1c51a05 100644
--- a/lisp/player.lisp
+++ b/lisp/player.lisp
@@ -59,6 +59,7 @@
 		(funcall list-function object-type player)))
 
 (defun player-has-ability (ability player)
+	;;TODO Remove this
 	"Check whether a player has the given ability"
 	(or	(member ability (player-ability player) :test #'equalp)
 		(dolist (i (player-item player) NIL)
diff --git a/lisp/ui.lisp b/lisp/ui.lisp
index 85237ee..5964e01 100644
--- a/lisp/ui.lisp
+++ b/lisp/ui.lisp
@@ -239,7 +239,7 @@
 		(return-from talk))
 	;; Allow for a bit of syntactic sugar
 	(let ((split-name (cut-string npc-name 3)))
-		(when (and (< 2 (length split-name)) (equalp (first split-name) "to "))
+		(when (and (< 1 (length split-name)) (equalp (first split-name) "to "))
 			(setf npc-name (second split-name))))
 	(let* ((place (get-game-object 'place (player-place player)))
 			  (npc-name (fuzzy-match npc-name (place-npc place)))
diff --git a/lisp/world.lisp b/lisp/world.lisp
index 0f90693..2c91abb 100644
--- a/lisp/world.lisp
+++ b/lisp/world.lisp
@@ -53,6 +53,7 @@
 
 (defun name-world (name)
 	"Set the name of the *world*"
+	;;XXX Do we still need this?
 	(debugging "~&The name of the world is ~A." name)
 	(setf (world-name *world*) name)
 	NIL)