Revert "some issues with main"

This reverts commit 3eef837d3a7f5fa0e290e3d98a7775329537596e.