level select+small tweeks
merge