Add more documentation and prepare for final API additions