Conditional fix still in progress
Fixed conditional parsing, tweaked entity toStrings