Minor changes, more API docs