Fixed some issues, still don't know whats the other issues