fixed some issues, added pull to refresh