Solved the final bug hopefully