Commenting, code organization.
Fixed a bug that would crash launcher.