Units; Further solutions added; Reports and images regenerated