Fix square logic and duplicate line draw bugs

Square is completed before all sides are checked. Lines can be drawn in occupied locations.