fixed some refresh issues