Intermediate update, some merging, some cleaing.