diff --git a/include/eepp/ee.hpp b/include/eepp/ee.hpp
index 22ba4062a..44939e994 100755
--- a/include/eepp/ee.hpp
+++ b/include/eepp/ee.hpp
@@ -22,9 +22,17 @@
 **/
 
 /**
+	@TODO Improve documentation.
+	@TODO Improve Premake4 support. It should be really easy to compile eepp in Windows and OS X ( Linux is always easy thanks to package managers ).
+	@TODO Add more examples, showing at least the basic usage of the engine ( 10 or more examples at least ).
+	@TODO Create a default UI Theme for the engine ( get rid off the ugly Aqua Theme ).
+	@TODO And may be, add some kind of support for TMX map files ( Tiles Map Editor ).
+	@TODO Improve the map editor ( add triggers, tiles selection to copy paste in other zones of the map, undo/redo actions ).
 	@TODO Add PVRTC and ETC support.
-	@TODO Check for endianness problems, and make EEPP endianness agnostic.
-	@TODO Add Scripting support ( squirrel or angel script or lua ).
+	@TODO Add Networking support ( may be just use SFML Network, i don't want to reinvent the wheel ).
+	@TODO Support UI Theming from scripts or XML.
+	@TODO Add Scripting support ( squirrel or angel script or lua ), at least some parts of the engine. Binding everthing seems too much work.
+	@TODO Check for endianness problems, and make EEPP endianness agnostic ( binary maps and texture fonts ). Not a priority, all the eepp target os use little endian.
 */
 
 	// General includes and declarations
diff --git a/include/eepp/system/cresourceloader.hpp b/include/eepp/system/cresourceloader.hpp
index 8ddedaa23..f33f83100 100644
--- a/include/eepp/system/cresourceloader.hpp
+++ b/include/eepp/system/cresourceloader.hpp
@@ -12,7 +12,7 @@ class EE_API cResourceLoader {
 	public:
 		typedef cb::Callback1<void, cResourceLoader *> ResLoadCallback;
 
-		/** @param MaxThreads Set the maximun simultaneous threads to load resources, if not value is seted it will use Num Cores - 1 or 1 thread if single core. */
+		/** @param MaxThreads Set the maximun simultaneous threads to load resources, THREADS_AUTO will use the cpu number of cores. */
 		cResourceLoader( const Uint32& MaxThreads = THREADS_AUTO );
 
 		virtual ~cResourceLoader();
@@ -37,6 +37,7 @@ class EE_API cResourceLoader {
 
 		bool			Clear( const bool& ClearObjectsLoaded = true );
 
+		/** @return The aproximate percent of progress ( between 0 and 100 ) */
 		eeFloat			Progress();
 
 		Uint32			Count() const;
diff --git a/include/eepp/system/safedatapointer.hpp b/include/eepp/system/safedatapointer.hpp
index 939451928..4a6000f4c 100644
--- a/include/eepp/system/safedatapointer.hpp
+++ b/include/eepp/system/safedatapointer.hpp
@@ -5,10 +5,13 @@
 
 namespace EE { namespace System {
 
+/** @brief Keep a pointer and release it in the SafeDataPointer destructor */
 class EE_API SafeDataPointer {
 	public:
 		SafeDataPointer();
 
+		SafeDataPointer( Uint8 * data, Uint32 size );
+
 		~SafeDataPointer();
 
 		Uint8 * Data;
diff --git a/include/eepp/system/tcontainer.hpp b/include/eepp/system/tcontainer.hpp
index bf931d8b9..9f89a0dad 100644
--- a/include/eepp/system/tcontainer.hpp
+++ b/include/eepp/system/tcontainer.hpp
@@ -6,6 +6,7 @@
 
 namespace EE { namespace System {
 
+/** @brief A simple resource container template */
 template <class T>
 class tContainer {
 	public:
diff --git a/include/eepp/system/tresourcemanager.hpp b/include/eepp/system/tresourcemanager.hpp
index 1183cce19..1813c33a9 100644
--- a/include/eepp/system/tresourcemanager.hpp
+++ b/include/eepp/system/tresourcemanager.hpp
@@ -6,9 +6,13 @@
 
 namespace EE { namespace System {
 
+/** @brief A simple resource manager. It keeps a list of the resources, and free the instances of the resources when the manager is closed.
+* Resources must have Id() and Name() properties. Id() is the string hash of Name().
+*/
 template <class T>
 class tResourceManager {
 	public:
+		/** @param UniqueId Indicates if the resources id must be unique */
 		tResourceManager( bool UniqueId = true );
 
 		virtual ~tResourceManager();
diff --git a/projects/linux/ee.creator.user b/projects/linux/ee.creator.user
index b360440fe..213165a69 100644
--- a/projects/linux/ee.creator.user
+++ b/projects/linux/ee.creator.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by Qt Creator 2.6.0, 2012-12-09T21:41:07. -->
+<!-- Written by Qt Creator 2.6.0, 2012-12-10T14:43:46. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
diff --git a/src/eepp/system/safedatapointer.cpp b/src/eepp/system/safedatapointer.cpp
index 858c4e030..ac4dbcc58 100644
--- a/src/eepp/system/safedatapointer.cpp
+++ b/src/eepp/system/safedatapointer.cpp
@@ -10,6 +10,12 @@ SafeDataPointer::SafeDataPointer() :
 {
 }
 
+SafeDataPointer::SafeDataPointer( Uint8 *data, Uint32 size ) :
+	Data( data ),
+	DataSize( size )
+{
+}
+
 SafeDataPointer::~SafeDataPointer() {
 	eeSAFE_DELETE_ARRAY( Data );
 }