Add calcs and reporting, resolve build problem