Fixed another batch of issues and problems.