some cleanup again. make blocks trigger updates