Fixed output when switching. Removed cli entrypoint, not needed right
now