Merge path change and bug fixes back into original keygen script.