A lot update and fixes.