Changed some names, add version info