solved a few more problems