styles charts and stuff
merges with master