Generic cleaning

- Removed some warnings
- Changed entitytype name to be capital as other entitytypes are
- Sponge behavior more like in vanilla now