fixing more things, banging head against wall, the usual