Globalizing & cleanup
1.0.25