fix a few bugs with the last few commits