fixed some menu items and variable issues