Fix parser bug and add more logs