added goto wiz command
Minor code cleanups before merge.