Fixed Refresh Bug and cleanup

Refresh would break everything. Not as bad. Still needs fixed though.