Cleaning up the code, adding provisions for multiple solutions for the same phase - this will be the case at higher clock frequencies