fixed almost everything on the to do list