Doc and fixes