Bug fixes and performance improvements
Tweaked the parse player