finished off some more problems.