Added joshie and emasher + fix for capes