last manual fix seems to have gotten most of the obvious bugs