adding more analysis, and fixing website display