diff --git a/README b/README
index bf8be171..4d3afb02 100644
--- a/README
+++ b/README
@@ -14,7 +14,7 @@ Please note LMS is still under development and will gain more features in the fu
 An android application is being developped as well.
 
 LMS is written entirely in C++. Therefore, it is suitable to run on embedded devices, where space and/or memory are limited.
-Please note some media files may require significant CPU usage to be trasncoded.
+Please note some media files may require significant CPU usage to be transcoded.
 
 I) DEPENCIES
 
diff --git a/TODO b/TODO
index 6e3e01e2..39fd7a31 100644
--- a/TODO
+++ b/TODO
@@ -4,7 +4,7 @@
 - Use our own WIOService
 
 [Services]
-- consider using external web server instead of builtin httpd (new FCGI service?)
+- consider adding support for external web servers (new FCGI service?)
 
 [Users]
 - Handle login lifetime?
@@ -16,7 +16,6 @@
 [Database]
 - Optim, use SQL query to get genre orphans
 - Use Inotify like system to watch modified/added files?
-- Implement a video database cleanup
 - count scan import errors
 
 [Metadata]
@@ -67,7 +66,6 @@
 
 [Remote API]
 - Implement text search options in the GetXXX messages
-- Implement genre id filters for Artist/Release
 
 [Logs]
-- capture transcoder log output to get more information
+- capture transcoder log output to get more information on errors