Fixed parsing of "test$"
Fixed up warnings for \r, and added warnings for &nbsp;