fixes + addition to debug menu