Updated docs + API cleanups