Added localization and improved shell
comments