Fixed new refresh system, fixed bugs