Fixing API doc and comments