Add version information, minor tweaks