muTli refactor and velocity fix