Fixed some bugs. 8 failed checks for now