Minor updates and unit converter