small improvements, just preparation for parsing…