clean up on calls, missing bits, and renamed the strategies