Updates and cleanup to Launcher and Launchable.