Polish dialogs, minor bug fixing