* Made parsing more robust
* Added slight efficiency changes