Removed some stuff from this fork and fixed an I18N Issue.