Launcher and builder fixed with more adds and
small cleanup of files & voids no used