Bug fixes, modified menu entry