Added more problems, cosmetic changes