Fixd the last menu

and some small things here and there.