MasterSharp and HypaJungle fixes + adds
Hypa