Various updates; add desktop/icons