Found some bugs, I think only one major is left