Code clean up and some more tries at solving on last refresh issue...