Further improvements and units in Wave