dynamic vol unit
misc fixes for issues encountered during import