fix a few bugs, but we have a new one!