Many commits with the aim to stabilize the app