Added menu, fix handling of multiple optional argument groups