Bug fixes! Yay its now working!