line component and some fixes