various fixes, tweaks and enhancements

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