changed override function arguments, added unoverride
added pop indicators
add recalc button