Add badges, refactor parser