Ok, first update this year. I will call it done for now, will make tweaks here and there.