Minor changes on launch and increasing accuracy