Some renaming and more exposing of APIs

Ready for the next version bump too
expose even more