Added some logs to bin
Improved parser code