fixes and refactor
[distro-setup] / maru-init