Scratchblocks update fixes

As discussed in #15. Hopefully this works now.