Added usage menu item, variable name changes