added more test variables and fix 1 bug
Fixed more bugs and made logs more verbose
Code reworked
Reworked in different files