More fixes

What changed

There were some bugs that were solved, and some code cleaning as well. A lot of known bugs have been solved.

Thanks to all contributors that are helping our project!
We ❤️ u