improved state saving
(still not working completely, as the app won't close??)
removed todo-comments (are there still untranslated strings somewhere?)