Ironed out all but one bug with block switching