Fix silly mistakes in circle fitting; Various style changes