updated joey's name + minor fixes