minor changes

*remove an obsolete FIXME
*make moving the vcup noncontinuous so we can do stuff in the middle (if
we want)