Updated to better reflect everything

Thanks were put in and people were credited for their work