Minor changes

Nearly finished, only need to implement chart update logic