cleanup, add more complex linetypes