Fixed comments and updated api doc