Finished arc collision test changes, refactored some geometry code.