-./inc/template-functions.php:1153: // @TODO This can be easily moved out after the merge from EL branch to this is complete
-./inc/template-functions.php:1186: // @TODO Add a little more infos here
-./inc/template-functions.php:1474:// @TODO Lame description for this function
-./inc/template-functions.php:1493: // @TODO Move this in a filter
-./inc/template-functions.php:280: // @TODO Remove this sanity-check if all is fine
-./inc/template-functions.php:593:// @TODO $simple/$constants are deprecated
-./inc/template-functions.php:620: // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
-./inc/wrapper-functions.php:127:// @TODO Implement $compress
-./inc/wrapper-functions.php:134:// @TODO Implement $decompress
-./inc/wrapper-functions.php:455:// @TODO Do some more sanity check here
-./mailid.php:138: // @TODO Rewrite this to a filter
-./mailid.php:95: // @TODO Rewrite this to a filter
-./mailid_top.php:132: // @TODO Rewrite this to a filter
-./mailid_top.php:179: // @TODO Rewrite this to a filter
-./mailid_top.php:186: // @TODO Rewrite this to a filter
-./mailid_top.php:222: // @TODO Rewrite these blocks to filter
-./mailid_top.php:257: // @TODO Try to rewrite the following unset()
-./mailid_top.php:99: // @TODO Rewrite this to a filter
+./inc/template-functions.php:1141: // @TODO This can be easily moved out after the merge from EL branch to this is complete
+./inc/template-functions.php:1174: // @TODO Add a little more infos here
+./inc/template-functions.php:1462:// @TODO Lame description for this function
+./inc/template-functions.php:1481: // @TODO Move this in a filter
+./inc/template-functions.php:189: * @TODO On some pages this is buggy
+./inc/template-functions.php:265: // @TODO Remove this sanity-check if all is fine
+./inc/template-functions.php:579:// @TODO $simple/$constants are deprecated
+./inc/template-functions.php:606: // @TODO Do only use $content and deprecate $GLOBALS and $DATA in templates
+./inc/wrapper-functions.php:132:// @TODO Implement $compress
+./inc/wrapper-functions.php:139:// @TODO Implement $decompress
+./inc/wrapper-functions.php:454:// @TODO Do some more sanity check here
+./mailid.php:140: // @TODO Rewrite this to a filter
+./mailid.php:97: // @TODO Rewrite this to a filter
+./mailid_top.php:101: // @TODO Rewrite this to a filter
+./mailid_top.php:134: // @TODO Rewrite this to a filter
+./mailid_top.php:181: // @TODO Rewrite this to a filter
+./mailid_top.php:188: // @TODO Rewrite this to a filter
+./mailid_top.php:223: // @TODO Rewrite these blocks to filter
+./mailid_top.php:256: // @TODO Try to rewrite the following unset()
+./network-check.php:56:// @TODO Add processing of request here