Some documentation & method name changes