Add some doc & fixes