- More fixes, refactored names, fixed associated translatations.