minor rejiggerings... why is this so damn hard? Argh...