Various improvements + doc updates