Adding Carlos changes to main branch, we are not being able to run main menu state, sigsev....
fixing conflict files