improved some lines