minor changes
solved launcher conflicts