Slight improvement? Fighting the last (hopefully) major bug.