Minor corrections
Advanced launcher support