Fix some more bugs
-TaskId bug
- String == String...