fixed bugs. now fully working normally.

Signed-off-by: ThePooN <thepoon@cartooncraft.fr>