fix some small issues, but have issues still with the refresh stuff