added menu, improvements