solved a few problems