some launcher cleanup and cursor consistency