More API and polishing.

Also added what I missed in the NS. Thanks again @Afforess.
Signed-off-by: Chris Sanders <zidane@outlook.com>