Minor code improvements + minor documentation changes/additions