Fixed some problems, now everythings is right