Small bug fix and better parser