Added more linetypes, began to solidify line construction method for manifest parser.