Some improvements

Some small improvements, faster circle code