skin fixes
skin cleanup final