Rolled back some minor bugs.
Added missing translation.