Further tweaks and addition of skin detection