fixed some more problems (charset case sensitivity), Todos now list.