bug fixing and preparig the ground for the simulation section of the app