Updated name, other minor things