Add version info and clean up string syntax