Added update scheduling (with delay) and other improvements.