Fixed some issues, still doesnt work