Various changes, added shortcut icon.