some lint tidy up + new launcher-spec