More leak fixes, not 100% yet
Merge branch 'dev_LA' into dev
Menu and state changing, ENTER TO START
Merge branch 'dev_LA' into dev
Merge branch 'dev_AO' into dev