added charting, fixed tabs