fixed spaghetti, added favorites