fix bugs; reduce network requests;