Made circle/line detection better