updated update panels, indicator update not quite working, still minor bugs around
fixed merge conflicts