added a couple problems and fixed some structure