fixing launch bugs