starting the challenges and fixed a few things