Continuing to fix bugs from last commit.