Added units to interface, rejigged stuff