fix everything that got broken in last commits

The last commits basically broke everything.