fix that oopsie
fix a few things with shamu
forgot to add those files for shamu in the last commit
add more missing moto proprietary files