Changed another couple of things to fix bugs.