Fixed storage bug
fix for restart and shutdown added + I18n preparations