0.7.2
Various code fixes