Added English support. Minor code refactors.