Switch to Liters, Updates

Switches to liters, and does some updates to other code.