Some code + doc adds