menu added but doing nothing, and others improvements