Compare strings by content, not by reference
Add comments, removes some unecessary FIXMEs