start fixing all the new bugs.... sigh