String parsing fix
Lots of stuff inside...