fix bugs. again.