VID-792 Added some docs & fixed some deprecated methods