Added credit along with other minor things